aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-12-25 10:10:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 c302c78907
commit 10557b5512
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
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,9 +999,19 @@ 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())
{ {
return UninstallOldClient; // if old client must be uninstalled
if (!uninstallingOldClient() && QFile::exists(getSrcServerDirectory() + "/Uninstall.exe"))
{
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;