mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-02 03:45:58 +01:00
Merge pull request #1705 from rindeal/patch-2
session/logind: check for XDG_SESSION_ID first
This commit is contained in:
commit
0ab1bb623e
1 changed files with 14 additions and 3 deletions
|
@ -538,15 +538,26 @@ static bool get_display_session(char **session_id) {
|
|||
assert(session_id != NULL);
|
||||
int ret;
|
||||
|
||||
char *type = NULL;
|
||||
char *state = NULL;
|
||||
char *xdg_session_id = getenv("XDG_SESSION_ID");
|
||||
|
||||
if (xdg_session_id) {
|
||||
// This just checks whether the supplied session ID is valid
|
||||
if (sd_session_is_active(xdg_session_id) < 0) {
|
||||
wlr_log(WLR_ERROR, "Invalid XDG_SESSION_ID: '%s'", xdg_session_id);
|
||||
goto error;
|
||||
}
|
||||
*session_id = strdup(xdg_session_id);
|
||||
return true;
|
||||
}
|
||||
|
||||
// If there's a session active for the current process then just use that
|
||||
ret = sd_pid_get_session(getpid(), session_id);
|
||||
if (ret == 0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
char *type = NULL;
|
||||
char *state = NULL;
|
||||
|
||||
// Find any active sessions for the user if the process isn't part of an
|
||||
// active session itself
|
||||
ret = sd_uid_get_display(getuid(), session_id);
|
||||
|
|
Loading…
Reference in a new issue