[gnome-session/gnome-3-10] gsm-manager: Don't abort when all clients exit



commit 3f3066f35b0b674a715614c037d40916845fe01b
Author: Colin Walters <walters verbum org>
Date:   Fri Oct 18 18:15:14 2013 -0400

    gsm-manager: Don't abort when all clients exit
    
    If all of our clients exit, remove_clients_for_connection()
    calls end_phase() which in turn invokes gsm_manager_quit() that
    checks the logout type.
    
    But at this point we only have _LOGOUT_NONE, so we end up aborting.
    It's fine to just call _quit() in this case, and this avoids us
    dumping core.
    
    This was happening to me when session startup failed for other
    reasons.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=710480

 gnome-session/gsm-manager.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
index 17b971c..e0d25b5 100644
--- a/gnome-session/gsm-manager.c
+++ b/gnome-session/gsm-manager.c
@@ -519,6 +519,7 @@ gsm_manager_quit (GsmManager *manager)
 
         switch (manager->priv->logout_type) {
         case GSM_MANAGER_LOGOUT_LOGOUT:
+        case GSM_MANAGER_LOGOUT_NONE:
                 gsm_quit ();
                 break;
         case GSM_MANAGER_LOGOUT_REBOOT:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]