flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Add support for alternate config file locations (#3578)

Browse Source
This commit is contained in:
Gareth Nelson
2017-02-22 13:10:32 +00:00
committed by Mattes D
parent c89b20695d
commit 1c31cb7eec
5 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Root.cpp
View File

@@ -141,8 +141,14 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> a_OverridesRepo)
LOG("Reading server config...");
m_SettingsFilename = "settings.ini";
if (a_OverridesRepo->HasValue("Server","ConfigFile"))
{
m_SettingsFilename = a_OverridesRepo->GetValue("Server","ConfigFile");
}
auto IniFile = cpp14::make_unique<cIniFile>();
bool IsNewIniFile = !IniFile->ReadFile("settings.ini");
bool IsNewIniFile = !IniFile->ReadFile(m_SettingsFilename);
if (IsNewIniFile)
{