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

Changed: Delete ryzom_installer_uninstalling_old_client when old client is uninstalled, see #279

Browse source
This commit is contained in:
kervala 2016-09-21 15:49:18 +02:00
parent 0acbe1c0d2
commit 21aee0b33e
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -466,7 +466,7 @@ bool CConfigFile::uninstallingOldClient() const
return QFile::exists(getInstallationDirectory() + "/ryzom_installer_uninstalling_old_client"); return QFile::exists(getInstallationDirectory() + "/ryzom_installer_uninstalling_old_client");
} }
void CConfigFile::setUninstallingOldClient(bool on) void CConfigFile::setUninstallingOldClient(bool on) const
{ {
QString filename = getInstallationDirectory() + "/ryzom_installer_uninstalling_old_client"; QString filename = getInstallationDirectory() + "/ryzom_installer_uninstalling_old_client";
@ -999,11 +999,21 @@ OperationStep CConfigFile::getInstallNextStep() const
if (!settings.contains("InstallLocation")) return CreateAddRemoveEntry; if (!settings.contains("InstallLocation")) return CreateAddRemoveEntry;
#endif #endif
if (!uninstallingOldClient() && m_shouldUninstallOldClient && !getSrcServerDirectory().isEmpty() && QFile::exists(getSrcServerDirectory() + "/Uninstall.exe")) if (m_shouldUninstallOldClient && !getSrcServerDirectory().isEmpty())
{
// if old client must be uninstalled
if (!uninstallingOldClient() && QFile::exists(getSrcServerDirectory() + "/Uninstall.exe"))
{ {
return UninstallOldClient; return UninstallOldClient;
} }
// if old client has been uninstalled
if (uninstallingOldClient() && !QFile::exists(getSrcServerDirectory() + "/Uninstall.exe"))
{
setUninstallingOldClient(false);
}
}
return Done; return Done;
} }

2
code/ryzom/tools/client/ryzom_installer/src/configfile.h
View file

@ -112,7 +112,7 @@ public:
void setShouldUninstallOldClient(bool on); void setShouldUninstallOldClient(bool on);
bool uninstallingOldClient() const; bool uninstallingOldClient() const;
void setUninstallingOldClient(bool on); void setUninstallingOldClient(bool on) const;
QString expandVariables(const QString &str) const; QString expandVariables(const QString &str) const;