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

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-10-17 13:09:17 +02:00
commit 1891033bc1
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/client/src/login_patch.cpp
View file

@ -933,7 +933,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
if (wantRyzomRestart) if (wantRyzomRestart)
{ {
// wait until client not in memory anymore // wait until client not in memory anymore
contentSuffix += toString("until ! pgrep %s > /dev/null; do sleep 1; done\n", CFile::getFilename(RyzomFilename).c_str()); contentSuffix += toString("until ! pgrep \"%s\" > /dev/null; do sleep 1; done\n", CFile::getFilename(RyzomFilename).c_str());
} }
// launch upgrade script if present (it'll execute additional steps like moving or deleting files) // launch upgrade script if present (it'll execute additional steps like moving or deleting files)

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

@ -983,7 +983,7 @@ OperationStep CConfigFile::getInstallNextStep() const
case -1: return LaunchInstalledInstaller; case -1: return LaunchInstalledInstaller;
// continue only if 0 and launched Installer is the installed one // continue only if 0 and launched Installer is the installed one
default: if (getInstallerCurrentDirPath() != getInstallerInstalledFilePath() && QFile::exists(getInstallerInstalledFilePath())) return LaunchInstalledInstaller; default: if (getInstallerCurrentFilePath() != getInstallerInstalledFilePath() && QFile::exists(getInstallerInstalledFilePath())) return LaunchInstalledInstaller;
} }
// no default profile // no default profile

4
code/ryzom/tools/client/ryzom_installer/src/main.cpp
View file

@ -256,14 +256,14 @@ int main(int argc, char *argv[])
{ {
#ifndef _DEBUG #ifndef _DEBUG
// restart more recent installed Installer version // restart more recent installed Installer version
if (QProcess::startDetached(config.getInstallerInstalledFilePath(), QApplication::arguments())) return 0; if (QProcess::startDetached(config.getInstallerInstalledFilePath())) return 0;
#endif #endif
} }
else if (step == Done) else if (step == Done)
{ {
#if defined(Q_OS_WIN) && !defined(_DEBUG) #if defined(Q_OS_WIN) && !defined(_DEBUG)
// restart Installer, so it could be copied in TEMP and allowed to update itself // restart Installer, so it could be copied in TEMP and allowed to update itself
if (QProcess::startDetached(QApplication::applicationFilePath(), QApplication::arguments())) return 0; if (QProcess::startDetached(QApplication::applicationFilePath())) return 0;
#endif #endif
} }
} }