]> git.ipfire.org Git - thirdparty/plymouth.git/commit
two-step: Always load the BGRT fallback image
authorHans de Goede <hdegoede@redhat.com>
Fri, 5 Mar 2021 10:57:53 +0000 (11:57 +0100)
committerHans de Goede <hdegoede@redhat.com>
Fri, 5 Mar 2021 12:52:38 +0000 (13:52 +0100)
commit9cb47b71cb089486cd9f6156f53f3bf1741809a0
tree95a9348a8d7b0ca6de4f60310321669d8694f70a
parent6bd905e5e8d5e059735eb16f946b9e96b1a75422
two-step: Always load the BGRT fallback image

view_set_bgrt_background() can fail even if the BGRT image was loaded
successfully. So we may need the fallback image even though the
BGRT image was loaded successfully.

This commit also fixes plugin->background_bgrt_fallback_image not being
free-ed and set to NULL when loading the fallback image fails.

Note this also drops the clearing of the use_firmware_background flagss
when we fail to load both the BGRT and the fallback images. Clearing
these flags is not necessary. They are only checked if
plugin->background_bgrt_image or plugin->background_bgrt_fallback_image
are non NULL; and if the loading of both images failed then both
are NULL.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
src/plugins/splash/two-step/plugin.c