BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2026-04-04 06:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added discord-rpc with different commit and proper signal handling

Browse Source
This commit is contained in:
Anonymous275
2022-01-19 23:31:11 +02:00
parent 27e61bc566
commit 07c353727e
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -13,3 +13,6 @@
[submodule "include/easyloggingpp"]
path = include/easyloggingpp
url = https://github.com/amrayn/easyloggingpp.git
[submodule "include/discord-rpc"]
path = include/discord-rpc
url = https://github.com/discord/discord-rpc.git

16
src/Launcher.cpp
View File

@@ -43,12 +43,10 @@ Launcher::~Launcher() {
Abort();
}
BOOL WINAPI CtrlHandler(DWORD Flag) {
if((Flag >= 0 && Flag < 3) || (Flag > 4 && Flag < 7)) {
Launcher::StaticAbort();
return 1;
}
return 0;
void ShutdownHandler(int sig) {
LOG(INFO) << "Got signal " << sig;
Launcher::StaticAbort();
exit(sig);
}
void Launcher::StaticAbort(Launcher* Instance) {
@@ -63,9 +61,9 @@ void Launcher::StaticAbort(Launcher* Instance) {
void Launcher::WindowsInit() {
system("cls");
SetConsoleTitleA(("BeamMP Launcher v" + FullVersion).c_str());
if(!SetConsoleCtrlHandler(CtrlHandler, TRUE)) {
LOG(WARNING) << "Failed to set CtrlHandler";
}
signal(SIGINT, ShutdownHandler);
signal(SIGTERM, ShutdownHandler);
signal(SIGABRT, ShutdownHandler);
}
void Launcher::LaunchGame() {