From bdf22f955d71d5b96764894f8b67133bbdbab18f Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 5 Oct 2022 18:24:37 +0200 Subject: Core/Scripts: Fixed worldserver startup with hostwap enabled when ran in terminals that don't pass full path to argv[0] --- src/server/game/Scripting/ScriptReloadMgr.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/server/game/Scripting/ScriptReloadMgr.cpp') diff --git a/src/server/game/Scripting/ScriptReloadMgr.cpp b/src/server/game/Scripting/ScriptReloadMgr.cpp index 4e2ded6b14f..ff842ee2bc1 100644 --- a/src/server/game/Scripting/ScriptReloadMgr.cpp +++ b/src/server/game/Scripting/ScriptReloadMgr.cpp @@ -51,6 +51,7 @@ ScriptReloadMgr* ScriptReloadMgr::instance() #include "Util.h" #include "World.h" #include +#include #include #include #include @@ -108,14 +109,7 @@ typedef void* HandleType; static fs::path GetDirectoryOfExecutable() { - ASSERT((!sConfigMgr->GetArguments().empty()), - "Expected the arguments to contain at least 1 element!"); - - fs::path path(sConfigMgr->GetArguments()[0]); - if (path.is_absolute()) - return path.parent_path(); - else - return fs::canonical(fs::absolute(path)).parent_path(); + return boost::dll::program_location().parent_path(); } class SharedLibraryUnloader -- cgit v1.2.3