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

UI/GTK: Avoid nested event loop when waiting for download path

Browse source 
We no longer support more than one event loop per process as of 02b2053
so this was causing a crash when taking a screenshot. We now spin the
main event loop until a "done" flag is set.
This commit is contained in:
Callum Law 2026-06-07 02:23:02 +12:00 committed by Andreas Kling
parent 728e6b010a
commit e2277e2e8a
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
UI/Gtk/Application.cpp
View file

@ -195,24 +195,26 @@ Optional<ByteString> Application::ask_user_for_download_path(StringView file) co
}
gtk_file_dialog_set_initial_name(GTK_FILE_DIALOG(dialog.ptr()), ByteString(file).characters());
Optional<ByteString> result;
Core::EventLoop nested_loop;
struct FileDialogSaveResult {
bool done { false };
Optional<ByteString> path;
} result;
gtk_file_dialog_save(GTK_FILE_DIALOG(dialog.ptr()), m_active_window->gtk_window(), nullptr, +[](GObject* source, GAsyncResult* async_result, gpointer user_data) {
auto* result_ptr = static_cast<Optional<ByteString>*>(user_data);
auto* result_ptr = static_cast<FileDialogSaveResult*>(user_data);
GError* error = nullptr;
GObjectPtr file { gtk_file_dialog_save_finish(GTK_FILE_DIALOG(source), async_result, &error) };
if (file.ptr()) {
g_autofree char* path = g_file_get_path(G_FILE(file.ptr()));
if (path)
*result_ptr = ByteString(path);
result_ptr->path = ByteString(path);
}
if (error)
g_error_free(error);
Core::EventLoop::current().quit(0); }, &result);
result_ptr->done = true; }, &result);
nested_loop.exec();
return result;
Core::EventLoop::current().spin_until([&] { return result.done; });
return result.path;
}
void Application::display_download_confirmation_dialog(StringView download_name, LexicalPath const& path) const