two-step: Do not jump to end-animation on halt/reboot if it is disabled

If the end-animation is disabled then directly becoming idle on halt /
reboot leads to no animation at all being shown.

Fix this by not jumping to the end-animation on halt/reboot if the
end-animation is disabled.

Fixes: 50c619ed41ca ("two-step: Add UseEndAnimation setting")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/src/plugins/splash/two-step/plugin.c b/src/plugins/splash/two-step/plugin.c
index 964855c9283c4b483e19e78c4c3c2cd8394a5ea2..d9749892812694823a29e8779c5ca0c6ed439758 100644 (file)
--- a/src/plugins/splash/two-step/plugin.c
+++ b/src/plugins/splash/two-step/plugin.c
@@ -1340,8 +1340,9 @@ start_progress_animation (ply_boot_splash_plugin_t *plugin)
          * but it's normally really fast, so just jump to
          * the end animation
          */
-        if (plugin->mode == PLY_BOOT_SPLASH_MODE_SHUTDOWN ||
-            plugin->mode == PLY_BOOT_SPLASH_MODE_REBOOT)
+        if (plugin->mode_settings[plugin->mode].use_end_animation &&
+            (plugin->mode == PLY_BOOT_SPLASH_MODE_SHUTDOWN ||
+             plugin->mode == PLY_BOOT_SPLASH_MODE_REBOOT))
                 become_idle (plugin, NULL);
 }