]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
two-step: fix unlock screen
authorRay Strode <rstrode@redhat.com>
Fri, 8 Nov 2013 13:31:32 +0000 (08:31 -0500)
committerRay Strode <rstrode@redhat.com>
Fri, 8 Nov 2013 13:39:37 +0000 (08:39 -0500)
The previous commit introduced a bug where the unlock screen won't
get shown if it's requested within the first 5 seconds of startup.

This commit fixes that by forcing a redraw if the state switches from
NORMAL.

src/plugins/splash/two-step/plugin.c

index 5dca355f859b30bd8b753d17e7f144d50f1f76c7..773e9bf4ec85f3cee4f968bd46e0528c5c648931 100644 (file)
@@ -925,7 +925,8 @@ on_draw (view_t                   *view,
 
       now = ply_get_timestamp ();
 
-      if (now - plugin->start_time < plugin->startup_delay)
+      if ((now - plugin->start_time < plugin->startup_delay) &&
+          plugin->state == PLY_BOOT_SPLASH_DISPLAY_NORMAL)
         return;
 
       if (view->is_blank)