diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp index 6dadeb5cd..bf3c64cb2 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp @@ -744,6 +744,9 @@ int CConfigFile::compareInstallersVersion() const if (!QFile::exists(installerDst)) return 1; QString installedVersion = getVersionFromExecutable(installerDst); + + nlinfo("%s version is %s", Q2C(installerDst), Q2C(installedVersion)); + QString newVersion = QApplication::applicationVersion(); QVersionNumber installedVer = QVersionNumber::fromString(installedVersion); diff --git a/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp b/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp index e74b92e89..298cc5185 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp @@ -277,7 +277,7 @@ void CDownloader::onHeadFinished() } // redirection - if (status == 302) + if (status == 302 || status == 307) { if (redirection.isEmpty()) { diff --git a/code/ryzom/tools/client/ryzom_installer/src/main.cpp b/code/ryzom/tools/client/ryzom_installer/src/main.cpp index 47201a807..5279678db 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/main.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/main.cpp @@ -144,19 +144,22 @@ int main(int argc, char *argv[]) // instanciate ConfigFile CConfigFile config; - OperationStep step = config.load() ? config.getInstallNextStep():DisplayNoServerError; - if (step == DisplayNoServerError) - { - QMessageBox::critical(NULL, QApplication::tr("Error"), QApplication::tr("Unable to find ryzom_installer.ini")); - return 1; - } + bool res = config.load(); // init log CLogHelper logHelper(config.getInstallationDirectory()); nlinfo("Launched %s", Q2C(config.getInstallerCurrentFilePath())); + OperationStep step = res ? config.getInstallNextStep():DisplayNoServerError; + + if (res == DisplayNoServerError) + { + QMessageBox::critical(NULL, QApplication::tr("Error"), QApplication::tr("Unable to find ryzom_installer.ini")); + return 1; + } + #if defined(Q_OS_WIN) && !defined(_DEBUG) // under Windows, Ryzom Installer should always be copied in TEMP directory QString tempPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation);