mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 09:19:01 +00:00
Changed: Delete ryzom_installer_uninstalling_old_client when old client is uninstalled, see #279
This commit is contained in:
parent
0acbe1c0d2
commit
21aee0b33e
2 changed files with 14 additions and 4 deletions
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue