From f39e1354942c53570f77dec41d1174720c7a56aa Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 29 Sep 2016 20:47:03 +0200 Subject: [PATCH] Fixed: Delete ryzom_installer.ini when uninstalling Installer --HG-- branch : develop --- code/ryzom/tools/client/ryzom_installer/src/configfile.cpp | 5 +++++ code/ryzom/tools/client/ryzom_installer/src/configfile.h | 1 + .../tools/client/ryzom_installer/src/operationdialog.cpp | 3 +++ 3 files changed, 9 insertions(+) diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp index 93caa15ac..c9ca60b9e 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp @@ -188,6 +188,11 @@ bool CConfigFile::save() const return true; } +bool CConfigFile::remove() +{ + return QFile::remove(m_configPath); +} + CConfigFile* CConfigFile::getInstance() { return s_instance; diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.h b/code/ryzom/tools/client/ryzom_installer/src/configfile.h index a279e6d7a..3203cb812 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/configfile.h +++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.h @@ -38,6 +38,7 @@ public: bool load(); bool load(const QString &filename); bool save() const; + bool remove(); static CConfigFile* getInstance(); diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp index ff63cd660..dd6dde356 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp @@ -1179,6 +1179,9 @@ void COperationDialog::deleteComponentsInstaller() } } + // delete configuration file + config->remove(); + // reset it once it's done m_removeComponents.installer = false;