]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
[fade-throbber] resume animations on display_normal
authorScott James Remnant <scott@ubuntu.com>
Thu, 18 Mar 2010 20:58:57 +0000 (20:58 +0000)
committerRay Strode <rstrode@redhat.com>
Mon, 22 Mar 2010 03:23:39 +0000 (23:23 -0400)
Change the display_normal() function so that rather than being a no-op
if we already saved the state as normal, it restarts any animations and
redraws the views.

The only thing we now do if the state is not previously the same is
hide any prompt.

This allows this to be used to reanimate the plugin on reactivate.

src/plugins/splash/fade-throbber/plugin.c

index 2e3221ef6e5063b0343dc6e8890ceca232cb0f98..639fce8c26f744f5a42f8373c8105e20c4ca9392 100644 (file)
@@ -1038,14 +1038,12 @@ static void
 display_normal (ply_boot_splash_plugin_t *plugin)
 {
   pause_views (plugin);
-  if (plugin->state ==  PLY_BOOT_SPLASH_DISPLAY_QUESTION_ENTRY ||
-      plugin->state ==  PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY)
-    {
-      plugin->state = PLY_BOOT_SPLASH_DISPLAY_NORMAL;
-      hide_prompt (plugin);
-      start_animation (plugin);
-      redraw_views (plugin);
-    }
+  if (plugin->state != PLY_BOOT_SPLASH_DISPLAY_NORMAL)
+    hide_prompt (plugin);
+
+  plugin->state = PLY_BOOT_SPLASH_DISPLAY_NORMAL;
+  start_animation (plugin);
+  redraw_views (plugin);
   unpause_views (plugin);
 }