summaryrefslogtreecommitdiff
path: root/gnome-settings-daemon
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-settings-daemon')
-rw-r--r--gnome-settings-daemon/main.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c
index 8c67e1ad..4ba09e05 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