[gnome-settings-daemon] main: exit gracefully if the session name is already taken

[Bastien Nocera <hadess src gnome org>]

commit 560ec62b97d8dc46296dd037531ae502d16953a8
Author: Peter Hutterer <peter hutterer who-t net>
Date:   Wed Dec 12 10:08:45 2012 +1000

    main: exit gracefully if the session name is already taken
    
    https://bugzilla.gnome.org/show_bug.cgi?id=690078

 gnome-settings-daemon/main.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c
index 8c67e1a..4ba09e0 100644
--- a/gnome-settings-daemon/main.c
+++ b/gnome-settings-daemon/main.c
@@ -369,8 +369,12 @@ name_lost_handler (GDBusConnection *connection,
         /* Name was already taken, or the bus went away */
 
         g_warning ("Name taken or bus went away - shutting down");
-        stop_manager (manager);
+
+        if (manager != NULL)
+                stop_manager (manager);
+
         gtk_main_quit ();
+
 }
 
 static void