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

Changed: Don't try to copy Installer several times (if it fails once, it'll fail forever)

Browse source
This commit is contained in:
kervala 2016-11-03 14:43:08 +01:00
parent d90983bee3
commit 2625225120
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,7 @@
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_installerCopied(false), m_use64BitsClient(false), m_shouldUninstallOldClient(true)
{ {
s_instance = this; s_instance = this;
@ -945,8 +945,8 @@ OperationStep CConfigFile::getInstallNextStep() const
} }
} }
// current installer more recent than installed one // current installer more recent than installed one and not already copied
if (compareInstallersVersion() == 1) return CopyInstaller; if (!m_installerCopied && compareInstallersVersion() == 1) return CopyInstaller;
// no default profile // no default profile
if (profile.id.isEmpty()) if (profile.id.isEmpty())
@ -992,7 +992,7 @@ OperationStep CConfigFile::getInstallNextStep() const
// current installer more recent than installed one // current installer more recent than installed one
switch (compareInstallersVersion()) switch (compareInstallersVersion())
{ {
// current installer more recent, copy it // current installer more recent, should be already copied
case 1: break; case 1: break;
// current installer older, launch the more recent installer // current installer older, launch the more recent installer

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

@ -57,6 +57,9 @@ public:
QString getLanguage() const { return m_language; } QString getLanguage() const { return m_language; }
bool getInstallerCopied() const { return m_installerCopied; }
void setInstallerCopied(bool copied) { m_installerCopied = copied; }
int getProfilesCount() const; int getProfilesCount() const;
CProfile getProfile(int i = -1) const; CProfile getProfile(int i = -1) const;
CProfile getProfile(const QString &id) const; CProfile getProfile(const QString &id) const;
@ -145,6 +148,7 @@ private:
int m_version; int m_version;
int m_defaultServerIndex; int m_defaultServerIndex;
int m_defaultProfileIndex; int m_defaultProfileIndex;
bool m_installerCopied;
CServers m_servers; CServers m_servers;
CProfiles m_profiles; CProfiles m_profiles;

3
code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
View file

@ -791,6 +791,9 @@ void COperationDialog::copyInstaller()
#endif #endif
createShortcut(shortcut, name, executable, "", icon, ""); createShortcut(shortcut, name, executable, "", icon, "");
// installer already copied, don't need to copy it again
config->setInstallerCopied(true);
} }
emit done(); emit done();