LibGUI: Always close() Dialogs no matter the execution result

Fixes Blocking modal race conditions when new windows are created in the same scope as Dialogs.
Author: https://github.com/thankyouverycool Commit: https://github.com/SerenityOS/serenity/commit/5c923977b7 Pull-request: https://github.com/SerenityOS/serenity/pull/16098
2022-11-17 09:17:30 -05:00 · 2022-11-17 09:17:30 -05:00 · 5c923977b7 · 2024-07-17 04:18:25 +09:00
commit 5c923977b7
parent 2028fbeae3
1 changed files with 2 additions and 1 deletions
--- a/Userland/Libraries/LibGUI/Dialog.cpp
+++ b/Userland/Libraries/LibGUI/Dialog.cpp
@ -112,6 +112,8 @@ Dialog::ExecResult Dialog::exec()

 void Dialog::done(ExecResult result)
 {
+    Window::close();
+
    if (!m_event_loop)
        return;
    m_result = result;
@ -137,7 +139,6 @@ void Dialog::event(Core::Event& event)

 void Dialog::close()
 {
-    Window::close();
    done(ExecResult::Cancel);
 }