[gdm: 1/2] libgdm: Remove duplicate sessions when on Xorg

[Iain Lane <iainl src gnome org>]

commit 2136c3baab81b6ec2115180f67ada91727e948f7
Author: Xiaoguang Wang <xwang suse com>
Date:   Thu Sep 26 09:16:06 2019 +0800

    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(-)
---
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);