From 928364e10251e0faff36559630b7d0f1f907cb7a Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Tue, 22 Jun 2021 19:22:26 +0200 Subject: [PATCH] TextEditor: Don't open files when the user cancelled saving changes Steps to reproduce: 1. Start TextEditor and make some changes to the document. 2. Try to open an existing file. 3. When prompted choose to save the changes to the existing document. 4. Close the file picker by clicking 'Cancel'. 5. Note how the file was opened anyway and your changes were lost. Same applies to the 'New File' action. --- Userland/Applications/TextEditor/MainWidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Userland/Applications/TextEditor/MainWidget.cpp b/Userland/Applications/TextEditor/MainWidget.cpp index 83eef1b554..3bc77d7492 100644 --- a/Userland/Applications/TextEditor/MainWidget.cpp +++ b/Userland/Applications/TextEditor/MainWidget.cpp @@ -249,7 +249,7 @@ MainWidget::MainWidget() auto save_document_first_result = GUI::MessageBox::show(window(), "Save changes to current document first?", "Warning", GUI::MessageBox::Type::Warning, GUI::MessageBox::InputType::YesNoCancel); if (save_document_first_result == GUI::Dialog::ExecResult::ExecYes) m_save_action->activate(); - if (save_document_first_result == GUI::Dialog::ExecResult::ExecCancel) + if (save_document_first_result != GUI::Dialog::ExecResult::ExecNo && editor().document().is_modified()) return; } @@ -268,7 +268,7 @@ MainWidget::MainWidget() auto save_document_first_result = GUI::MessageBox::show(window(), "Save changes to current document first?", "Warning", GUI::MessageBox::Type::Warning, GUI::MessageBox::InputType::YesNoCancel); if (save_document_first_result == GUI::Dialog::ExecResult::ExecYes) m_save_action->activate(); - if (save_document_first_result == GUI::Dialog::ExecResult::ExecCancel) + if (save_document_first_result != GUI::Dialog::ExecResult::ExecNo && editor().document().is_modified()) return; }