Skip to content

Commit debf201

Browse files
committed
Add .conf file location fallback to current folder
1 parent dd1ef89 commit debf201

File tree

3 files changed

+20
-10
lines changed

3 files changed

+20
-10
lines changed

src/game/AuctionHouseBot/AuctionHouseBot.cpp

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -401,11 +401,16 @@ bool AuctionBotConfig::Initialize()
401401
{
402402
if (!m_AhBotCfg.SetSource(m_configFileName.c_str()))
403403
{
404-
sLog.outString("AHBOT is Disabled. Unable to open configuration file %s. ", m_configFileName.c_str());
405-
setConfig(CONFIG_UINT32_AHBOT_ALLIANCE_ITEM_AMOUNT_RATIO, 0);
406-
setConfig(CONFIG_UINT32_AHBOT_HORDE_ITEM_AMOUNT_RATIO, 0);
407-
setConfig(CONFIG_UINT32_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO, 0);
408-
return false;
404+
// Try current folder as fallback
405+
if (!m_AhBotCfg.SetSource(AUCTIONHOUSEBOT_CONFIG_NAME))
406+
{
407+
sLog.outString("AHBOT is Disabled. Unable to open configuration file %s. ", m_configFileName.c_str());
408+
setConfig(CONFIG_UINT32_AHBOT_ALLIANCE_ITEM_AMOUNT_RATIO, 0);
409+
setConfig(CONFIG_UINT32_AHBOT_HORDE_ITEM_AMOUNT_RATIO, 0);
410+
setConfig(CONFIG_UINT32_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO, 0);
411+
return false;
412+
}
413+
m_configFileName = AUCTIONHOUSEBOT_CONFIG_NAME;
409414
}
410415
else
411416
{

src/mangosd/mangosd.cpp

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,12 +371,17 @@ int main(int argc, char** argv)
371371
#endif
372372
if (!sConfig.SetSource(cfg_file))
373373
{
374-
sLog.outError("Could not find configuration file %s.", cfg_file);
375-
Log::WaitBeforeContinueIfNeed();
376-
return 1;
374+
// Try current folder as fallback if SYSCONFDIR path fails
375+
if (!sConfig.SetSource(MANGOSD_CONFIG_NAME))
376+
{
377+
sLog.outError("Could not find configuration file %s.", cfg_file);
378+
Log::WaitBeforeContinueIfNeed();
379+
return 1;
380+
}
381+
cfg_file = MANGOSD_CONFIG_NAME;
377382
}
378383

379-
#ifndef _WIN32 // posix daemon commands need apply after config read
384+
#ifndef _WIN32
380385
switch (serviceDaemonMode)
381386
{
382387
case 'r':

src/realmd

Submodule realmd updated 1 file

0 commit comments

Comments
 (0)