fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-07 06:08:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'two-step-end-animation-fix' into 'master'

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

See merge request plymouth/plymouth!100
This commit is contained in:
Hans de Goede 2020-03-24 18:29:37 +00:00
commit f7358f1535
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/plugins/splash/two-step/plugin.c
View file

@ -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);
}