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.

diff --git a/src/main.c b/src/main.c
index c613bbca2d517547d2c6ffa16a5f2a37fab8c46b..91e06493e57070da80da334ee4334c018009fb3f 100644 (file)
--- 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)