summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-02-29 18:14:17 +0300
committerAndrei Karas <akaras@inbox.ru>2012-02-29 18:14:17 +0300
commit9327a603fcc3c1b3ff91ae21e478094b30a32f7f (patch)
treedf7a6c4cf2b0306b3c75a486c61881697bfc552a /src
parente70d551884c0e11408176086a25d359987090003 (diff)
downloadmv-9327a603fcc3c1b3ff91ae21e478094b30a32f7f.tar.gz
mv-9327a603fcc3c1b3ff91ae21e478094b30a32f7f.tar.bz2
mv-9327a603fcc3c1b3ff91ae21e478094b30a32f7f.tar.xz
mv-9327a603fcc3c1b3ff91ae21e478094b30a32f7f.zip
Fix per server config default values.
Diffstat (limited to 'src')
-rw-r--r--src/client.cpp1
-rw-r--r--src/defaults.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 5f79176c7..0324bb8cc 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1697,6 +1697,7 @@ void Client::initServerConfig(std::string serverName)
{
fclose(configFile);
serverConfig.init(configPath);
+ serverConfig.setDefaultValues(getConfigDefaults());
logger->log("serverConfigPath: " + configPath);
}
initPacketLimiter();
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 3e53506b4..87771c427 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -229,6 +229,7 @@ DefaultsData* getConfigDefaults()
AddDEF(configData, "grabinput", false);
AddDEF(configData, "gamma", 1);
AddDEF(configData, "vsync", 0);
+ AddDEF(configData, "enableBuggyServers", true);
AddDEF(configData, "soundwhisper", "newmessage");
AddDEF(configData, "soundhighlight", "reminder");
AddDEF(configData, "soundglobal", "email");