Merge pull request aldelaro5#146 from cristian64/treat_failed_save_ac…

…tion_as_cancel Treat failed save actions as cancel actions.
cristian64 · May 18, 2024 · bd8f6b0 · bd8f6b0
2 parents d493afc + 6fc6691
commit bd8f6b0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/Source/GUI/MemWatcher/MemWatchWidget.cpp b/Source/GUI/MemWatcher/MemWatchWidget.cpp
@@ -672,7 +672,7 @@ void MemWatchWidget::openWatchFile()
   }
 }
 
-void MemWatchWidget::saveWatchFile()
+bool MemWatchWidget::saveWatchFile()
 {
   if (QFile::exists(m_watchListFile))
   {
@@ -684,22 +684,20 @@ void MemWatchWidget::saveWatchFile()
           "An error occured while creating and opening the watch list file for writting",
           QMessageBox::Ok, this);
       errorBox->exec();
-      return;
+      return false;
     }
     QJsonObject root;
     m_watchModel->writeRootToJsonRecursive(root);
     QJsonDocument saveDoc(root);
     watchFile.write(saveDoc.toJson());
     watchFile.close();
     m_hasUnsavedChanges = false;
+    return true;
   }
-  else
-  {
-    saveAsWatchFile();
-  }
+  return saveAsWatchFile();
 }
 
-void MemWatchWidget::saveAsWatchFile()
+bool MemWatchWidget::saveAsWatchFile()
 {
   QString fileName = QFileDialog::getSaveFileName(this, "Save watch list", m_watchListFile,
                                                   "Dolphin memory watches file (*.dmw)");
@@ -715,7 +713,7 @@ void MemWatchWidget::saveAsWatchFile()
           "An error occured while creating and opening the watch list file for writting",
           QMessageBox::Ok, this);
       errorBox->exec();
-      return;
+      return false;
     }
     QJsonObject root;
     m_watchModel->writeRootToJsonRecursive(root);
@@ -724,7 +722,9 @@ void MemWatchWidget::saveAsWatchFile()
     watchFile.close();
     m_watchListFile = fileName;
     m_hasUnsavedChanges = false;
+    return true;
   }
+  return false;
 }
 
 void MemWatchWidget::clearWatchList()
@@ -844,8 +844,7 @@ bool MemWatchWidget::warnIfUnsavedChanges()
     case QMessageBox::No:
       return true;
     case QMessageBox::Yes:
-      saveWatchFile();
-      return true;
+      return saveWatchFile();
     default:
       return false;
     }

diff --git a/Source/GUI/MemWatcher/MemWatchWidget.h b/Source/GUI/MemWatcher/MemWatchWidget.h
@@ -36,8 +36,8 @@ class MemWatchWidget : public QWidget
   void copySelectedWatchesToClipBoard();
   void cutSelectedWatchesToClipBoard();
   void pasteWatchFromClipBoard(const QModelIndex& referenceIndex);
-  void saveWatchFile();
-  void saveAsWatchFile();
+  bool saveWatchFile();
+  bool saveAsWatchFile();
   void clearWatchList();
   void importFromCTFile();
   void exportWatchListAsCSV();