summaryrefslogtreecommitdiff
path: root/daemon/gdm-local-display-factory.c
diff options
context:
space:
mode:
authorBenjamin Berg <bberg@redhat.com>2021-03-15 12:38:36 +0100
committerBenjamin Berg <bberg@redhat.com>2021-03-15 12:38:36 +0100
commit36c040fd8daccafc3105407d7fa4ef7bc3d2d73c (patch)
treec2f2aec17945fdcd1692959f9269bdbec183393d /daemon/gdm-local-display-factory.c
parentf55d27917d0d94a350f4bb86d82fee38fccc047a (diff)
downloadgdm-36c040fd8daccafc3105407d7fa4ef7bc3d2d73c.tar.gz
local-display-factory: Fix wait for graphical
In commit a37e5a950fbd ("local-display-factory: Wait for seats to become graphical") we introduced logic to wait for up to 10s for the seat to become graphical before trying to use it. Unfortunately, the logic was slightly wrong, resulting us to immediately do the fallback rather than waiting.
Diffstat (limited to 'daemon/gdm-local-display-factory.c')
-rw-r--r--daemon/gdm-local-display-factory.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
index bc55f0c4..8a4ef06c 100644
--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
@@ -544,8 +544,9 @@ ensure_display_for_seat (GdmLocalDisplayFactory *factory,
} else {
/* It is not yet time to force X11 fallback. */
g_debug ("GdmLocalDisplayFactory: seat0 display requested when there is no graphics support before graphics check timeout.");
- return;
}
+
+ return;
}
g_debug ("GdmLocalDisplayFactory: Assuming we can use seat0 for X11 even though system says it doesn't support graphics!");