From a3f85fa8cd96fb5903f0186a8882db4aed69329e Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 18 May 2016 09:56:22 +0200 Subject: [PATCH] Changed: Save/load configuration filename --HG-- branch : develop --- code/ryzom/tools/client/ryzom_installer/src/configfile.cpp | 6 ++++++ code/ryzom/tools/client/ryzom_installer/src/configfile.h | 1 + 2 files changed, 7 insertions(+) diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp index e7d883314..20ec6544b 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp @@ -82,10 +82,13 @@ bool CConfigFile::load(const QString &filename) server.clientDownloadFilename = settings.value("client_download_filename").toString(); #if defined(Q_OS_WIN) server.clientFilename = settings.value("client_filename_windows").toString(); + server.configurationFilename = settings.value("configuration_filename_windows").toString(); #elif defined(Q_OS_MAC) server.clientFilename = settings.value("client_filename_osx").toString(); + server.configurationFilename = settings.value("configuration_filename_osx").toString(); #else server.clientFilename = settings.value("client_filename_linux").toString(); + server.configurationFilename = settings.value("configuration_filename_linux").toString(); #endif server.comments = settings.value("comments").toString(); @@ -154,10 +157,13 @@ bool CConfigFile::save() const settings.setValue("client_download_filename", server.clientDownloadFilename); #if defined(Q_OS_WIN) settings.setValue("client_filename_windows", server.clientFilename); + settings.setValue("configuration_filename_windows", server.configurationFilename); #elif defined(Q_OS_MAC) settings.setValue("client_filename_osx", server.clientFilename); + settings.setValue("configuration_filename_osx", server.configurationFilename); #else settings.setValue("client_filename_linux", server.clientFilename); + settings.setValue("configuration_filename_linux", server.configurationFilename); #endif settings.setValue("comments", server.comments); diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.h b/code/ryzom/tools/client/ryzom_installer/src/configfile.h index 8909e39e6..9fcced465 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/configfile.h +++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.h @@ -35,6 +35,7 @@ struct CServer QString clientDownloadUrl; QString clientDownloadFilename; QString clientFilename; + QString configurationFilename; QString comments; };