summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2014-02-05 15:12:17 -0500
committerRay Strode <rstrode@redhat.com>2014-02-05 15:12:17 -0500
commitb87a016cc8ff94cf7f8686173fd161a5cb50f455 (patch)
treedb74f4301b13c19c0d1e2d3d18cd72c6d180cca9
parente41af2d6459d471a9b613728bdbecf2a462b8dc6 (diff)
main: cancel show_splash timeout on deactivate
This fixes a race/crash where plymouthd get deactivated right before the show timer fires and it tries to show itself after things have been torn down.
-rw-r--r--src/main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c
index c613bbca..91e06493 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1242,6 +1242,8 @@ on_deactivate (state_t *state,
state->deactivate_trigger = deactivate_trigger;
ply_trace ("deactivating");
+ cancel_pending_delayed_show (state);
+
ply_device_manager_deactivate_keyboards (state->device_manager);
if (state->boot_splash != NULL)