From b87a016cc8ff94cf7f8686173fd161a5cb50f455 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 5 Feb 2014 15:12:17 -0500 Subject: [PATCH] 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. --- src/main.c | 2 ++ 1 file changed, 2 insertions(+) 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)