aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-30 07:35:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-10-20 14:48:16 +02:00
commit 1879212116
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -744,6 +744,9 @@ int CConfigFile::compareInstallersVersion() const
if (!QFile::exists(installerDst)) return 1; if (!QFile::exists(installerDst)) return 1;
QString installedVersion = getVersionFromExecutable(installerDst); QString installedVersion = getVersionFromExecutable(installerDst);
nlinfo("%s version is %s", Q2C(installerDst), Q2C(installedVersion));
QString newVersion = QApplication::applicationVersion(); QString newVersion = QApplication::applicationVersion();
QVersionNumber installedVer = QVersionNumber::fromString(installedVersion); QVersionNumber installedVer = QVersionNumber::fromString(installedVersion);

2
code/ryzom/tools/client/ryzom_installer/src/downloader.cpp
View file

@ -277,7 +277,7 @@ void CDownloader::onHeadFinished()
} }
// redirection // redirection
if (status == 302) if (status == 302 || status == 307)
{ {
if (redirection.isEmpty()) if (redirection.isEmpty())
{ {

15
code/ryzom/tools/client/ryzom_installer/src/main.cpp
View file

@ -144,19 +144,22 @@ int main(int argc, char *argv[])
// instanciate ConfigFile // instanciate ConfigFile
CConfigFile config; 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 // init log
CLogHelper logHelper(config.getInstallationDirectory()); CLogHelper logHelper(config.getInstallationDirectory());
nlinfo("Launched %s", Q2C(config.getInstallerCurrentFilePath())); 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) #if defined(Q_OS_WIN) && !defined(_DEBUG)
// under Windows, Ryzom Installer should always be copied in TEMP directory // under Windows, Ryzom Installer should always be copied in TEMP directory
QString tempPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation); QString tempPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation);