summaryrefslogtreecommitdiff
path: root/src/configmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-31 01:34:38 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-31 01:34:38 +0300
commite826d4c63365dde4c988453846437dcb65370945 (patch)
tree1bd23d4694c06d97e7e8c885253c0100fe6142b9 /src/configmanager.cpp
parent75ca03c95c90064e67fa9eaddb4c609196dd3a27 (diff)
downloadmv-e826d4c63365dde4c988453846437dcb65370945.tar.gz
mv-e826d4c63365dde4c988453846437dcb65370945.tar.bz2
mv-e826d4c63365dde4c988453846437dcb65370945.tar.xz
mv-e826d4c63365dde4c988453846437dcb65370945.zip
Improve setting default values for configuration objects.
Diffstat (limited to 'src/configmanager.cpp')
-rw-r--r--src/configmanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/configmanager.cpp b/src/configmanager.cpp
index 1039c5a01..b34688b76 100644
--- a/src/configmanager.cpp
+++ b/src/configmanager.cpp
@@ -79,7 +79,7 @@ void ConfigManager::initServerConfig(const std::string &serverName)
{
fclose(configFile);
serverConfig.init(configPath);
- serverConfig.setDefaultValues(getConfigDefaults());
+ setConfigDefaults(serverConfig);
logger->log("serverConfigPath: " + configPath);
}
else
@@ -165,7 +165,7 @@ void ConfigManager::initConfiguration()
fclose(configFile);
config.init(configPath);
logger->log1("init 3");
- config.setDefaultValues(getConfigDefaults());
+ setConfigDefaults(config);
logger->log("configuration file: " + configPath);
}
}