try one last time to properly handle open

Sigil-Ebook · Feb 9, 2020 · 5489ab7 · 5489ab7
1 parent 0a20476
commit 5489ab7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/MainWindow.cpp b/MainWindow.cpp
@@ -1492,7 +1492,7 @@ void MainWindow::Open()
             modified = true;
         }
     }
-    if (modified) if (MaybeSaveDialogSaysProceed())
+    if (MaybeSaveDialogSaysProceed(modified))
 #endif 
     {
         const QMap<QString, QString> load_filters = MainWindow::GetLoadFiltersMap();
@@ -1813,11 +1813,15 @@ void MainWindow::sizeMenuIcons() {
     }
 }
 
-bool MainWindow::MaybeSaveDialogSaysProceed()
+bool MainWindow::MaybeSaveDialogSaysProceed(bool modified)
 {
     // allow processing of any outstanding events
     qApp->processEvents();
 
+    // since if nothing is modified you can not discard anything (as it is already saved)
+    // and since you do not need to save anything (nothing can be lost)
+    if (!modified) return true;
+
     QMessageBox::StandardButton button_pressed;
     button_pressed = QMessageBox::warning(this,
 					tr("PageEdit"),

diff --git a/MainWindow.h b/MainWindow.h
@@ -177,7 +177,7 @@ public slots:
     void resizeEvent(QResizeEvent * event);
     void moveEvent(QMoveEvent *event);
     void closeEvent(QCloseEvent * event);
-    bool MaybeSaveDialogSaysProceed();
+    bool MaybeSaveDialogSaysProceed(bool modified);
     QString GetCleanHtml();
     QString GetSource();
     QString GetHTMLToPaste(const QString & hmtl_snippet);