diff options
| author | Markus Mittendrein <git@maxmitti.tk> | 2015-10-07 13:54:53 +0200 |
|---|---|---|
| committer | Markus Mittendrein <git@maxmitti.tk> | 2015-10-07 14:51:40 +0200 |
| commit | 6a3dfa36d2888f847726ba469de80653aa518bce (patch) | |
| tree | 7da4c5163dff18ee00e41197d84f5566a0128a83 | |
| parent | a991319eb0cdc878d951090abb1eaccab29e5e7f (diff) | |
| download | manager-6a3dfa36d2888f847726ba469de80653aa518bce.tar.gz manager-6a3dfa36d2888f847726ba469de80653aa518bce.zip | |
Cleanup usage of args
| -rw-r--r-- | src/CRSMConfig.hpp | 2 | ||||
| -rw-r--r-- | src/crsm.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/CRSMConfig.hpp b/src/CRSMConfig.hpp index c161b68..1c265ec 100644 --- a/src/CRSMConfig.hpp +++ b/src/CRSMConfig.hpp @@ -248,7 +248,7 @@ public: struct { struct { - String Arguments = "/fullscreen /lobby:300 /nosignup Objects.c4d"; + String Arguments = "/config:config /fullscreen /lobby:300 /nosignup Objects.c4d"; String Config = "config"; String Executable = "clonk-server"; List(String) IgnoreFolders = {"Network", "Records.c4f", "Savegames.c4f"}; diff --git a/src/crsm.cpp b/src/crsm.cpp index 5c478d8..d74d2db 100644 --- a/src/crsm.cpp +++ b/src/crsm.cpp @@ -24,7 +24,6 @@ CRSM::CRSM(QObject *parent) : outputBuffer.setFileName(MGMT_BUFFER_FILENAME); outputBuffer.open(QFile::WriteOnly | QFile::Unbuffered); - args << "/fullscreen" << "/config:config" << "/lobby:60" << "/nosignup"; finish = false; ok = true; @@ -700,7 +699,9 @@ void CRSM::readConfig() { Config.clear(); out(Config.read(CONFIG_FILE_NAME)); - args = QString("/config:" + Config.Clonk.Server.Config + " " + Config.Clonk.Server.Arguments).split(" "); + args.clear(); + args << "/config:" + Config.Clonk.Server.Config; + args << Config.Clonk.Server.Arguments.split(" "); Config.Auto.Volatile.Clonk.Directory = QFileInfo(Config.Clonk.Server.Executable).absoluteDir().absolutePath() + QDir::separator(); Config.CRSM.ListFolder = QDir(Config.CRSM.ListFolder).absolutePath() + QDir::separator(); |