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.
This commit is contained in:
Ray Strode 2014-02-05 15:12:17 -05:00
parent e41af2d645
commit b87a016cc8

View file

@ -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)