diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-09-08 22:15:42 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-09-08 22:15:42 +0200 |
| commit | 5cdea8b30cda77d6a9d93921b0f667d51ec89c6f (patch) | |
| tree | 0cf4e6bd15cdbe3543cda20702a9a17abbd2b7a8 /src/server/shared/Configuration/Config.cpp | |
| parent | 668fe43d51208738cb95c0d30a3077d998832b50 (diff) | |
| parent | e181af1b1c983c8dc492f20eb4720973f002c538 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/shared/Configuration/Config.cpp')
| -rw-r--r-- | src/server/shared/Configuration/Config.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/shared/Configuration/Config.cpp b/src/server/shared/Configuration/Config.cpp index 6b83f562520..21bbd063b53 100644 --- a/src/server/shared/Configuration/Config.cpp +++ b/src/server/shared/Configuration/Config.cpp @@ -59,7 +59,7 @@ bool ConfigMgr::LoadInitial(std::string const& file, std::string& error) bool ConfigMgr::Reload(std::string& error) { - return LoadInitial(_filename.c_str(), error); + return LoadInitial(_filename, error); } std::string ConfigMgr::GetStringDefault(std::string const& name, const std::string& def) |