summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2018-06-22 14:55:39 -0400
committerRay Strode <rstrode@redhat.com>2018-06-22 16:09:47 -0400
commit9b65b9331089db6aaaf8df222eb87b6ef8241838 (patch)
tree5a6485af38ec82490972696d137e328bf8d31c84
parent7e39951149306089e2f32c2ec420c10ce8c083c2 (diff)
downloadgdm-9b65b9331089db6aaaf8df222eb87b6ef8241838.tar.gz
manager: start login screen if old one is finished
Since commit 22c332ba we try to start a login screen if we end up on an empty VT and there isn't one running. Unfortunately the check for "is on an empty VT" is a little busted. It counts the VT has non-empty if there's a display associated with it, even if that display is in the FINISHED state about to be reaped. That means, in some cases, we'll still leave the user on an empty VT with no login screen. This commit addresses the problem by explicitly checking for FINISHED displays, and proceeding even in their presense.
-rw-r--r--daemon/gdm-manager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index 155e009f..c3cbabd8 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -1440,7 +1440,7 @@ maybe_activate_other_session (GdmManager *self,
lookup_by_session_id,
(gpointer) session_id);
- if (display == NULL) {
+ if (display == NULL || gdm_display_get_status (display) == GDM_DISPLAY_FINISHED) {
activate_login_window_session_on_seat (self, seat_id);
}