diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-12-12 10:08:45 +1000 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2012-12-12 13:19:38 +0100 |
| commit | 560ec62b97d8dc46296dd037531ae502d16953a8 (patch) | |
| tree | cd2893c12a8b81fd157a28de92c7b64d4aa7775f /gnome-settings-daemon | |
| parent | 916bfd5a49ca3af80c6fd8ec0d295f89f396cac7 (diff) | |
| download | gnome-settings-daemon-560ec62b97d8dc46296dd037531ae502d16953a8.tar.gz | |
main: exit gracefully if the session name is already taken
https://bugzilla.gnome.org/show_bug.cgi?id=690078
Diffstat (limited to 'gnome-settings-daemon')
| -rw-r--r-- | 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 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 |