summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2014-03-06 10:02:21 -0500
committerRay Strode <rstrode@redhat.com>2014-03-06 10:07:05 -0500
commit6c9fddafb1d8f5901653a824acc6974ad773af71 (patch)
tree3dbc709fd9f2850c36364d435f96814336077707
parent5bfb903449d1168fe9e242b8c170622e5e953029 (diff)
main: call update_display when splash is shown
we need to call update display any time a splash is shown, because there may be a pending password request. The code attempted to do this in show_splash, but did it before the splash was assigned to running state, so function was a noop. This commit moves it a little later in code after the splash is properly assigned.
-rw-r--r--src/main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index 92a1cfd3..e8d852ed 100644
--- a/src/main.c
+++ b/src/main.c
@@ -321,6 +321,7 @@ show_detailed_splash (state_t *state)
}
state->boot_splash = splash;
+ update_display (state);
}
static const char *
@@ -477,6 +478,8 @@ show_default_splash (state_t *state)
ply_error ("plymouthd: could not start boot splash: %m");
return;
}
+
+ update_display (state);
}
static void
@@ -1712,7 +1715,6 @@ show_theme (state_t *state,
ply_device_manager_activate_keyboards (state->device_manager);
show_messages (state);
- update_display (state);
return splash;
}