From: Ray Strode <rstrode@redhat.com>
Date: Wed, 5 Feb 2014 20:12:17 +0000 (-0500)
Subject: main: cancel show_splash timeout on deactivate
X-Git-Tag: 0.9.0~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b87a016cc8ff94cf7f8686173fd161a5cb50f455;p=thirdparty%2Fplymouth.git

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