summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2012-05-05 22:49:54 -0400
committerRay Strode <rstrode@redhat.com>2012-05-06 00:32:04 -0400
commitfe89c906e5a8d6d5e9140226866d315e97d3bee3 (patch)
tree801e9b6b3fbe5efa51a32c8dc5f32002e1a9618a
parent09358813114e1c16b1ea02d80327e418a1809486 (diff)
downloadgdm-fe89c906e5a8d6d5e9140226866d315e97d3bee3.tar.gz
daemon: don't freak out if greeter dies after login finishes
If we've already logged a user in and the greeter is shutting down and crashes, we should just ignore the crash and continue with the login process. Furthermore, if we explicitly kill the greeter and it dies with a TERM signal, then we definitely don't want to treat that as if it was a crash.
-rw-r--r--daemon/gdm-simple-slave.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 7c709a6e..bf48246c 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -1032,7 +1032,9 @@ on_greeter_session_died (GdmGreeterSession *greeter,
GdmSimpleSlave *slave)
{
g_debug ("GdmSimpleSlave: Greeter died: %d", signal);
- gdm_slave_stopped (GDM_SLAVE (slave));
+ if (slave->priv->start_session_service_name == NULL) {
+ gdm_slave_stopped (GDM_SLAVE (slave));
+ }
}
static void