aboutsummaryrefslogtreecommitdiff
path: root/src/common/Configuration/Config.cpp
diff options
context:
space:
mode:
authorNaios <naios-dev@live.de>2016-04-18 20:29:42 +0200
committerNaios <naios-dev@live.de>2016-04-18 23:03:24 +0200
commit51ec8d3b8cc6d2691b4a9c0d4502fd1936d82c79 (patch)
tree61667f6e4bc15ad98e171bc224721d3f859bd0e1 /src/common/Configuration/Config.cpp
parent2809f11839ff0fd4eec45b2e116811b0698dd05b (diff)
Core/Scripting: Use the path of the worldserver executable to search for the scripts dir
* Fixes issues when starting the worldserver not in the bin directory or the CMAKE_INSTALL_PREFIX directory using the -c option. (cherry picked from commit 86b0fcf67aadc0d313253befb0590d00efd085bc)
Diffstat (limited to 'src/common/Configuration/Config.cpp')
-rw-r--r--src/common/Configuration/Config.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/common/Configuration/Config.cpp b/src/common/Configuration/Config.cpp
index 1f340b38e42..fb2ba333cfa 100644
--- a/src/common/Configuration/Config.cpp
+++ b/src/common/Configuration/Config.cpp
@@ -26,11 +26,13 @@
using namespace boost::property_tree;
-bool ConfigMgr::LoadInitial(std::string const& file, std::string& error)
+bool ConfigMgr::LoadInitial(std::string const& file, std::vector<std::string> args,
+ std::string& error)
{
std::lock_guard<std::mutex> lock(_configLock);
_filename = file;
+ _args = args;
try
{
@@ -66,7 +68,7 @@ ConfigMgr* ConfigMgr::instance()
bool ConfigMgr::Reload(std::string& error)
{
- return LoadInitial(_filename, error);
+ return LoadInitial(_filename, std::move(_args), error);
}
template<class T>