BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2025-08-17 16:57:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23 from SamZahreddine/v3

Browse Source 
[Changed] static inline instead of normal static for "Shutdown" and "Exit"
This commit is contained in:
Anonymous275 2022-07-21 11:37:32 +03:00 committed by GitHub
commit 17cea23381
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Launcher.h
View File

@ -77,7 +77,7 @@ private: //variables
std::string Version{"2.0"}; std::string Version{"2.0"};
Server ServerHandler{this}; Server ServerHandler{this};
std::string TargetBuild{"default"}; std::string TargetBuild{"default"};
static std::atomic<bool> Shutdown, Exit; static inline std::atomic<bool> Shutdown{false}, Exit{false};
std::string FullVersion{Version + ".99"}; std::string FullVersion{Version + ".99"};
VersionParser SupportedVersion{"0.24.1.2"}; VersionParser SupportedVersion{"0.24.1.2"};
IPC IPCToGame{"BeamMP_OUT", "BeamMP_Sem1", "BeamMP_Sem2", 0x1900000}; IPC IPCToGame{"BeamMP_OUT", "BeamMP_Sem1", "BeamMP_Sem2", 0x1900000};

1
src/Launcher.cpp
View File

@ -20,7 +20,6 @@ LONG WINAPI CrashHandler(EXCEPTION_POINTERS* p) {
return EXCEPTION_EXECUTE_HANDLER; return EXCEPTION_EXECUTE_HANDLER;
} }
std::atomic<bool> Launcher::Shutdown{false}, Launcher::Exit{false};
Launcher::Launcher(int argc, char* argv[]) : CurrentPath(std::filesystem::path(argv[0])), DiscordMessage("Just launched") { Launcher::Launcher(int argc, char* argv[]) : CurrentPath(std::filesystem::path(argv[0])), DiscordMessage("Just launched") {
Launcher::StaticAbort(this); Launcher::StaticAbort(this);
DiscordTime = std::time(nullptr); DiscordTime = std::time(nullptr);