From: Hans de Goede Date: Mon, 23 Mar 2020 16:20:03 +0000 (+0100) Subject: two-step: Do not jump to end-animation on halt/reboot if it is disabled X-Git-Tag: 0.9.5~9^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=69ddb497e25711eec8843183260b34e12f168cfd;p=thirdparty%2Fplymouth.git 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 --- diff --git a/src/plugins/splash/two-step/plugin.c b/src/plugins/splash/two-step/plugin.c index 964855c9..d9749892 100644 --- 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); }