From 2f0bf8a69fe077d841e36d2229465c31d4edfd02 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 21 Oct 2016 12:57:35 +0200 Subject: [PATCH] Changed: Only check if Ryzom is installed in current directory under Windows --- .../ryzom/tools/client/ryzom_installer/src/configfile.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp index c6b7a577d..437652599 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp @@ -839,8 +839,13 @@ OperationStep CConfigFile::getInstallNextStep() const // only show wizard if installation directory undefined if (getInstallationDirectory().isEmpty()) { + QString currentDirectory; + +#ifdef Q_OS_WIN32 + // only under Windows + // if launched from current directory, it means we just patched files - QString currentDirectory = getCurrentDirectory(); + currentDirectory = getCurrentDirectory(); if (!isRyzomInstalledIn(currentDirectory)) { @@ -852,6 +857,7 @@ OperationStep CConfigFile::getInstallNextStep() const currentDirectory.clear(); } } +#endif // install or migrate depending if Ryzom was found in current directory return currentDirectory.isEmpty() ? ShowInstallWizard:ShowMigrateWizard;