diff options
| author | Iain Lane <iain@orangesquash.org.uk> | 2019-09-26 09:17:13 +0000 |
|---|---|---|
| committer | Iain Lane <iain@orangesquash.org.uk> | 2019-09-26 09:17:13 +0000 |
| commit | be1b6cc8312852efa97acd4031663aa4efa6ac11 (patch) | |
| tree | 9e559b323ed40ded4ffa878582eacc907057580f | |
| parent | ec4ea508f81cabbe14d2559284106108da08196f (diff) | |
| parent | 2136c3baab81b6ec2115180f67ada91727e948f7 (diff) | |
| download | gdm-be1b6cc8312852efa97acd4031663aa4efa6ac11.tar.gz | |
Merge branch 'wip/xiaoguang/duplicated-session' into 'master'
libgdm: Remove duplicate sessions when on Xorg
See merge request GNOME/gdm!84
| -rw-r--r-- | libgdm/gdm-sessions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libgdm/gdm-sessions.c b/libgdm/gdm-sessions.c index affc09bb..75d442ee 100644 --- a/libgdm/gdm-sessions.c +++ b/libgdm/gdm-sessions.c @@ -291,7 +291,7 @@ collect_sessions (void) #ifdef ENABLE_WAYLAND_SUPPORT #ifdef ENABLE_USER_DISPLAY_SERVER if (g_getenv ("WAYLAND_DISPLAY") == NULL && g_getenv ("RUNNING_UNDER_GDM") != NULL) { - return; + goto out; } #endif @@ -300,6 +300,7 @@ collect_sessions (void) } #endif +out: g_hash_table_foreach_remove (gdm_available_sessions_map, remove_duplicate_sessions, names_seen_before); |