Merge with develop

--HG--
branch : compatibility-develop

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);

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())
 		{

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)
+	bool res = config.load();
-	{
-		QMessageBox::critical(NULL, QApplication::tr("Error"), QApplication::tr("Unable to find ryzom_installer.ini"));
-		return 1;
-	}
 
 	// 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);