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

Changed: Only check if Ryzom is installed in current directory under Windows

Browse source
This commit is contained in:
kervala 2016-10-21 12:57:35 +02:00
parent 2583d447f3
commit d1073593b0
1 changed files with 7 additions and 1 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

@ -839,8 +839,13 @@ OperationStep CConfigFile::getInstallNextStep() const
// only show wizard if installation directory undefined // only show wizard if installation directory undefined
if (getInstallationDirectory().isEmpty()) if (getInstallationDirectory().isEmpty())
{ {
QString currentDirectory;
#ifdef Q_OS_WIN32
// only under Windows
// if launched from current directory, it means we just patched files // if launched from current directory, it means we just patched files
QString currentDirectory = getCurrentDirectory(); currentDirectory = getCurrentDirectory();
if (!isRyzomInstalledIn(currentDirectory)) if (!isRyzomInstalledIn(currentDirectory))
{ {
@ -852,6 +857,7 @@ OperationStep CConfigFile::getInstallNextStep() const
currentDirectory.clear(); currentDirectory.clear();
} }
} }
#endif
// install or migrate depending if Ryzom was found in current directory // install or migrate depending if Ryzom was found in current directory
return currentDirectory.isEmpty() ? ShowInstallWizard:ShowMigrateWizard; return currentDirectory.isEmpty() ? ShowInstallWizard:ShowMigrateWizard;