]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
main: clear is_shown state from hide_splash
authorRay Strode <rstrode@redhat.com>
Fri, 10 Jan 2014 16:47:08 +0000 (11:47 -0500)
committerRay Strode <rstrode@redhat.com>
Fri, 10 Jan 2014 19:18:07 +0000 (14:18 -0500)
Right now we clear is_shown after calling hide_splash in a couple
of places.  It makes more sense to clear this flag in one place,
in hide_splash, rather than duplicating code.

src/main.c

index 91dfe209ba93eb86cebd5b2a5548d268cf7765d8..8e3c503a3c132e9c22aafd1ca66793e0a166b9b8 100644 (file)
@@ -1001,6 +1001,8 @@ quit_splash (state_t *state)
 static void
 hide_splash (state_t *state)
 {
+  state->is_shown = false;
+
   if (state->boot_splash == NULL)
     return;
 
@@ -1018,9 +1020,6 @@ dump_details_and_quit_splash (state_t *state)
 
   ply_device_manager_deactivate_renderers (state->device_manager);
   hide_splash (state);
-
-  state->is_shown = false;
-
   quit_splash (state);
 }
 
@@ -1129,8 +1128,6 @@ on_boot_splash_idle (state_t *state)
           ply_trace ("hiding splash");
           ply_device_manager_deactivate_renderers (state->device_manager);
           hide_splash (state);
-
-          state->is_shown = false;
         }
 
       ply_trace ("quitting splash");