From 480b126c7fb62d2d435dd3509cf6768aa9a5f65d Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 26 Jun 2016 19:42:35 +0200 Subject: [PATCH] Fixed: Launch old Uninstaller after copying old profile --- .../tools/client/ryzom_installer/src/configfile.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp index 47315f6ac..2167707c9 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp @@ -862,11 +862,6 @@ OperationStep CConfigFile::getInstallNextStep() const return CopyInstaller; } - if (m_shouldUninstallOldClient && !getSrcServerDirectory().isEmpty() && QFile::exists(getSrcServerDirectory() + "/Uninstall.exe")) - { - return UninstallOldClient; - } - // no default profile if (profile.id.isEmpty()) { @@ -898,6 +893,11 @@ OperationStep CConfigFile::getInstallNextStep() const if (!settings.contains("InstallLocation")) return CreateAddRemoveEntry; #endif + if (m_shouldUninstallOldClient && !getSrcServerDirectory().isEmpty() && QFile::exists(getSrcServerDirectory() + "/Uninstall.exe")) + { + return UninstallOldClient; + } + return Done; }