0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

DisplaySettings: Handle errors when loading wallpaper bitmap

Browse source 
Prior this change, the app crashed if the first file in alphabetical
order in /res/wallpapers couldn't be decoded.
This commit is contained in:
Karol Kosek 2021-11-14 21:25:59 +01:00 • committed by Linus Groh
parent ac65fb40d9
commit e38b3f526e
Notes: sideshowbarker 2024-07-18 01:04:45 +09:00
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Userland/Applications/DisplaySettings/MonitorWidget.cpp
View file

@ -30,23 +30,22 @@ bool MonitorWidget::set_wallpaper(String path)
if (!is_different_to_current_wallpaper_path(path))
return false;
Threading::BackgroundAction<RefPtr<Gfx::Bitmap>>::construct(
[path](auto&) {
RefPtr<Gfx::Bitmap> bmp;
if (!path.is_empty())
bmp = Gfx::Bitmap::try_load_from_file(path).release_value_but_fixme_should_propagate_errors();
return bmp;
Threading::BackgroundAction<ErrorOr<NonnullRefPtr<Gfx::Bitmap>>>::construct(
[path](auto&) -> ErrorOr<NonnullRefPtr<Gfx::Bitmap>> {
if (path.is_empty())
return Error::from_errno(ENOENT);
return Gfx::Bitmap::try_load_from_file(path);
},
[this, path](RefPtr<Gfx::Bitmap> bitmap) {
[this, path](ErrorOr<NonnullRefPtr<Gfx::Bitmap>> bitmap_or_error) {
// If we've been requested to change while we were loading the bitmap, don't bother spending the cost to
// move and render the now stale bitmap.
if (is_different_to_current_wallpaper_path(path))
return;
if (!bitmap.is_null())
m_wallpaper_bitmap = move(bitmap);
else
if (bitmap_or_error.is_error())
m_wallpaper_bitmap = nullptr;
else
m_wallpaper_bitmap = bitmap_or_error.release_value();
m_desktop_dirty = true;
update();
});