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

Fixed: Only ask once if user want to uninstall Ryzom, see #279

Browse source
This commit is contained in:
kervala 2016-09-14 08:14:56 +02:00
parent 90b9372fe3
commit dae4a3b93e
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,8 @@
CConfigFile *CConfigFile::s_instance = NULL; CConfigFile *CConfigFile::s_instance = NULL;
CConfigFile::CConfigFile(QObject *parent):QObject(parent), m_version(-1), CConfigFile::CConfigFile(QObject *parent):QObject(parent), m_version(-1),
m_defaultServerIndex(0), m_defaultProfileIndex(0), m_use64BitsClient(false), m_shouldUninstallOldClient(true) m_defaultServerIndex(0), m_defaultProfileIndex(0), m_use64BitsClient(false), m_shouldUninstallOldClient(true),
m_uninstallingOldClient(false)
{ {
s_instance = this; s_instance = this;
@ -461,6 +462,16 @@ void CConfigFile::setShouldUninstallOldClient(bool on)
m_shouldUninstallOldClient = on; m_shouldUninstallOldClient = on;
} }
bool CConfigFile::uninstallingOldClient() const
{
return m_uninstallingOldClient;
}
void CConfigFile::setUninstallingOldClient(bool on)
{
m_uninstallingOldClient = on;
}
QString CConfigFile::expandVariables(const QString &str) const QString CConfigFile::expandVariables(const QString &str) const
{ {
QString res = str; QString res = str;
@ -972,7 +983,7 @@ 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")) if (!m_uninstallingOldClient && m_shouldUninstallOldClient && !getSrcServerDirectory().isEmpty() && QFile::exists(getSrcServerDirectory() + "/Uninstall.exe"))
{ {
return UninstallOldClient; return UninstallOldClient;
} }

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

@ -109,6 +109,9 @@ public:
bool shouldUninstallOldClient() const; bool shouldUninstallOldClient() const;
void setShouldUninstallOldClient(bool on); void setShouldUninstallOldClient(bool on);
bool uninstallingOldClient() const;
void setUninstallingOldClient(bool on);
QString expandVariables(const QString &str) const; QString expandVariables(const QString &str) const;
QString getClientArch() const; QString getClientArch() const;
@ -147,6 +150,7 @@ private:
QString m_srcDirectory; QString m_srcDirectory;
bool m_use64BitsClient; bool m_use64BitsClient;
bool m_shouldUninstallOldClient; bool m_shouldUninstallOldClient;
bool m_uninstallingOldClient;
QString m_language; QString m_language;
QString m_defaultConfigPath; QString m_defaultConfigPath;