Merge remote-tracking branch 'origin/master'

1 files changed, 10 insertions, 7 deletions

diff --git a/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp b/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp
index 52a29c01..9e4ce499 100644
--- a/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp
@@ -496,11 +496,14 @@ void MainUI::closeEvent(QCloseEvent *ev){
       unsaved << tmp->currentFile();
     }
   }
-  bool quitnow = unsaved.isEmpty();
-  if(!quitnow && !ui->actionShow_Popups->isChecked()){ quitnow = true; }
-  if(!quitnow){
-    quitnow = (QMessageBox::Yes == QMessageBox::question(this, tr("Lose Unsaved Changes?"), QString(tr("There are unsaved changes.\nDo you want to close the editor anyway?\n\n%1")).arg(unsaved.join("\n")), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) );
-  }
-  if(quitnow){ QMainWindow::closeEvent(ev); }
-  else{ ev->ignore(); }
+  if(unsaved.isEmpty()){ QMainWindow::closeEvent(ev); return; }
+  bool savenow = false;
+  if(!savenow && !ui->actionShow_Popups->isChecked()){ savenow = true; }
+  if(!savenow){
+      QMessageBox::StandardButton but = QMessageBox::question(this, tr("Save Changes before closing?"), QString(tr("There are unsaved changes.\nDo you want save them before you close the editor?\n\n%1")).arg(unsaved.join("\n")), QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, QMessageBox::No);
+      savenow = (but == QMessageBox::Yes);
+      if(but == QMessageBox::Cancel){ ev->ignore(); return; }
+    }
+    if(savenow){ SaveFile(); }
+    QMainWindow::closeEvent(ev);
 }