From 6147ad46e723d08a5803b94ad5d8c65842a8c132 Mon Sep 17 00:00:00 2001 From: Sam39 Date: Thu, 21 Jul 2022 11:34:46 +0300 Subject: [PATCH] [Changed] "Shutdown" and "Exit" to inline for initialization Co-Authored-By: Anonymous275 <36374260+Anonymous-275@users.noreply.github.com> --- include/Launcher.h | 2 +- src/Launcher.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/Launcher.h b/include/Launcher.h index fffcd1c..767be0e 100644 --- a/include/Launcher.h +++ b/include/Launcher.h @@ -77,7 +77,7 @@ private: //variables std::string Version{"2.0"}; Server ServerHandler{this}; std::string TargetBuild{"default"}; - static std::atomic Shutdown, Exit; + static inline std::atomic Shutdown{false}, Exit{false}; std::string FullVersion{Version + ".99"}; VersionParser SupportedVersion{"0.24.1.2"}; IPC IPCToGame{"BeamMP_OUT", "BeamMP_Sem1", "BeamMP_Sem2", 0x1900000}; diff --git a/src/Launcher.cpp b/src/Launcher.cpp index c5c5457..a4f36c6 100644 --- a/src/Launcher.cpp +++ b/src/Launcher.cpp @@ -20,7 +20,6 @@ LONG WINAPI CrashHandler(EXCEPTION_POINTERS* p) { return EXCEPTION_EXECUTE_HANDLER; } -std::atomic Launcher::Shutdown{false}, Launcher::Exit{false}; Launcher::Launcher(int argc, char* argv[]) : CurrentPath(std::filesystem::path(argv[0])), DiscordMessage("Just launched") { Launcher::StaticAbort(this); DiscordTime = std::time(nullptr);