From c6fe0da5696b482f96ff9de92c88b14337e99104 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Sat, 18 Jul 2015 17:36:08 +0200 Subject: [PATCH] Abort closing the app if saving a database failed. --- src/gui/DatabaseTabWidget.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp index e36edbee..9f467bc2 100644 --- a/src/gui/DatabaseTabWidget.cpp +++ b/src/gui/DatabaseTabWidget.cpp @@ -234,7 +234,9 @@ bool DatabaseTabWidget::closeDatabase(Database* db) } if (dbStruct.modified) { if (config()->get("AutoSaveOnExit").toBool()) { - saveDatabase(db); + if (!saveDatabase(db)) { + return false; + } } else { QMessageBox::StandardButton result = @@ -243,7 +245,9 @@ bool DatabaseTabWidget::closeDatabase(Database* db) tr("\"%1\" was modified.\nSave changes?").arg(dbName), QMessageBox::Yes | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Yes); if (result == QMessageBox::Yes) { - saveDatabase(db); + if (!saveDatabase(db)) { + return false; + } } else if (result == QMessageBox::Cancel) { return false;