From 1c31cb7eecc92d2fb218da8948e3201b618a46d2 Mon Sep 17 00:00:00 2001
From: Gareth Nelson <gareth@garethnelson.com>
Date: Wed, 22 Feb 2017 13:10:32 +0000
Subject: Add support for alternate config file locations (#3578)

---
 src/Root.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/Root.cpp')

diff --git a/src/Root.cpp b/src/Root.cpp
index 37fbf125f..508d0a648 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -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)
 	{
-- 
cgit v1.2.3