From 2136c3baab81b6ec2115180f67ada91727e948f7 Mon Sep 17 00:00:00 2001 From: Xiaoguang Wang Date: Thu, 26 Sep 2019 09:16:06 +0800 Subject: libgdm: Remove duplicate sessions when on Xorg When gdm works on Xorg it's possible to have duplicate sessions, we need to remove them. --- libgdm/gdm-sessions.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libgdm') 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); -- cgit v1.2.1