From 42a85def60036a5788a9dd862d0c6f835b62337c Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Fri, 14 Mar 2014 21:18:17 +0100 Subject: [PATCH] Get rid of one reloadInstanceVersion --- gui/dialogs/OneSixModEditDialog.cpp | 4 ---- logic/VersionFinal.cpp | 8 ++++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gui/dialogs/OneSixModEditDialog.cpp b/gui/dialogs/OneSixModEditDialog.cpp index 7dac68e5..2d459001 100644 --- a/gui/dialogs/OneSixModEditDialog.cpp +++ b/gui/dialogs/OneSixModEditDialog.cpp @@ -145,10 +145,6 @@ void OneSixModEditDialog::on_removeLibraryBtn_clicked() { QMessageBox::critical(this, tr("Error"), tr("Couldn't remove file")); } - else - { - reloadInstanceVersion(); - } } } diff --git a/logic/VersionFinal.cpp b/logic/VersionFinal.cpp index 2901fcf9..d0e85c15 100644 --- a/logic/VersionFinal.cpp +++ b/logic/VersionFinal.cpp @@ -72,9 +72,13 @@ bool VersionFinal::canRemove(const int index) const } bool VersionFinal::remove(const int index) { - if (canRemove(index)) + if (canRemove(index) && QFile::remove(versionFiles.at(index)->filename)) { - return QFile::remove(versionFiles.at(index)->filename); + beginResetModel(); + versionFiles.removeAt(index); + reapply(true); + endResetModel(); + return true; } return false; }