beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 09:00:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibThreading: Execute on_error on the original EventLoop

Browse source 
As the user might want to have interactions with LibGUI while handling
errors, this code should be executed in the original `EventLoop`.
Similarly to what is done with the error-free path.
This commit is contained in:
Lucas CHOLLET 2023-03-18 16:05:46 -04:00 committed by Linus Groh
parent b084759690
commit ebb9c3a430
Notes: sideshowbarker 2024-07-16 22:43:48 +09:00 
Author: https://github.com/LucasChollet
Commit: https://github.com/SerenityOS/serenity/commit/ebb9c3a430
Pull-request: https://github.com/SerenityOS/serenity/pull/17918
Reviewed-by: https://github.com/linusg
Reviewed-by: https://github.com/mpurnell1
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Userland/Libraries/LibGUI/FileSystemModel.cpp
View file

@ -720,12 +720,16 @@ bool FileSystemModel::fetch_thumbnail_for(Node const& node)
};
auto const on_error = [path](Error error) -> void {
s_thumbnail_cache.with_locked([path, error = move(error)](auto& cache) {
if (error != Error::from_errno(ECANCELED)) {
cache.thumbnail_cache.set(path, nullptr);
dbgln("Failed to load thumbnail for {}: {}", path, error);
}
cache.loading_thumbnails.remove(path);
// Note: We need to defer that to avoid the function removing its last reference
// i.e. trying to destroy itself, which is prohibited.
Core::EventLoop::current().deferred_invoke([&] {
s_thumbnail_cache.with_locked([path, error = move(error)](auto& cache) {
if (error != Error::from_errno(ECANCELED)) {
cache.thumbnail_cache.set(path, nullptr);
dbgln("Failed to load thumbnail for {}: {}", path, error);
}
cache.loading_thumbnails.remove(path);
});
});
};

8
Userland/Libraries/LibThreading/BackgroundAction.h
View file

@ -98,8 +98,12 @@ private:
error = result.release_error();
m_promise->cancel(Error::from_errno(ECANCELED));
if (m_on_error)
m_on_error(move(error));
if (m_on_error) {
origin_event_loop->deferred_invoke([this, error = move(error)]() mutable {
m_on_error(move(error));
});
origin_event_loop->wake();
}
remove_from_parent();
}