aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-17 13:01:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: Special case under Windows when Installer is run from TEMP directory

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-10-18 10:26:41 +02:00
parent bf8d9aef12
commit 6801bf34d4
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -983,7 +983,19 @@ 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 (getInstallerCurrentFilePath() != getInstallerInstalledFilePath() && QFile::exists(getInstallerInstalledFilePath())) return LaunchInstalledInstaller; default:
{
#ifdef Q_OS_WIN32
QString tempPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
// check if launched from TEMP directory
bool rightPath = getInstallerCurrentDirPath().startsWith(tempPath);
#else
bool rightPath = false;
#endif
if (!rightPath && getInstallerCurrentFilePath() != getInstallerInstalledFilePath() && QFile::exists(getInstallerInstalledFilePath())) return LaunchInstalledInstaller;
}
} }
// no default profile // no default profile