diff options
author | Ray Strode <rstrode@redhat.com> | 2015-02-26 10:00:21 -0500 |
---|---|---|
committer | Ray Strode <rstrode@redhat.com> | 2015-02-26 12:45:47 -0500 |
commit | d870ed4db67bb32f2c1e97677f50894735feef5b (patch) | |
tree | 944ecf711070e0623185f7c9bb54ba9d26824931 | |
parent | 678ac9657d3166dcdeadbccb7ad9427ba0677339 (diff) | |
download | gdm-d870ed4db67bb32f2c1e97677f50894735feef5b.tar.gz |
manager: quit plymouth later
We don't want to quit plymouth until the display is managed,
so there's no chance of flicker.
https://bugzilla.gnome.org/show_bug.cgi?id=745234
-rw-r--r-- | daemon/gdm-manager.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c index 14085827..cfcfa03f 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c @@ -1549,12 +1549,6 @@ on_display_status_changed (GdmDisplay *display, switch (status) { case GDM_DISPLAY_PREPARED: case GDM_DISPLAY_MANAGED: -#ifdef WITH_PLYMOUTH - if (quit_plymouth) { - plymouth_quit_with_transition (); - manager->priv->plymouth_is_running = FALSE; - } -#endif if ((display_number == -1 && status == GDM_DISPLAY_PREPARED) || (display_number != -1 && status == GDM_DISPLAY_MANAGED)) { char *session_class; @@ -1568,6 +1562,12 @@ on_display_status_changed (GdmDisplay *display, } if (status == GDM_DISPLAY_MANAGED) { +#ifdef WITH_PLYMOUTH + if (quit_plymouth) { + plymouth_quit_with_transition (); + manager->priv->plymouth_is_running = FALSE; + } +#endif maybe_start_pending_initial_login (manager, display); } break; |