Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Launch old Uninstaller after copying old profile

Browse source
This commit is contained in:
kervala 2016-06-26 19:42:35 +02:00
parent 50638b102e
commit 6ef915ae81
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
View file

@ -862,11 +862,6 @@ OperationStep CConfigFile::getInstallNextStep() const
return CopyInstaller; return CopyInstaller;
} }
if (m_shouldUninstallOldClient && !getSrcServerDirectory().isEmpty() && QFile::exists(getSrcServerDirectory() + "/Uninstall.exe"))
{
return UninstallOldClient;
}
// no default profile // no default profile
if (profile.id.isEmpty()) if (profile.id.isEmpty())
{ {
@ -898,6 +893,11 @@ OperationStep CConfigFile::getInstallNextStep() const
if (!settings.contains("InstallLocation")) return CreateAddRemoveEntry; if (!settings.contains("InstallLocation")) return CreateAddRemoveEntry;
#endif #endif
if (m_shouldUninstallOldClient && !getSrcServerDirectory().isEmpty() && QFile::exists(getSrcServerDirectory() + "/Uninstall.exe"))
{
return UninstallOldClient;
}
return Done; return Done;
} }