From 8121a370ceb2cbd35928aa5fa9689b538ed49c77 Mon Sep 17 00:00:00 2001 From: taynpg Date: Wed, 16 Apr 2025 11:29:07 -0400 Subject: [PATCH] fix: server ctrl-c exit recovery color --- .gitignore | 3 ++- crashelper | 2 +- server/main.cpp | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a07d994..8e42bef 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ cmake-* .xmake compile_commands.json out -xpbuild \ No newline at end of file +xpbuild +cbuild diff --git a/crashelper b/crashelper index 5ec7814..2cf72f3 160000 --- a/crashelper +++ b/crashelper @@ -1 +1 @@ -Subproject commit 5ec78141817eef68f92a89b19ea5675f8b5b559b +Subproject commit 2cf72f3e5c5313527b5d1442017caf06d51a3c02 diff --git a/server/main.cpp b/server/main.cpp index 3989409..40cbaa9 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -25,7 +25,7 @@ namespace fs = std::filesystem; #include #endif -void signal_handler(int signal) +void msignal_handler(int signal) { if (signal == SIGINT) { fc_recovery_color(); @@ -41,7 +41,7 @@ int main(int argc, char* argv[]) backward::SetDumpFileSavePath(err); backward::SetDumpLogSavePath(err); CRASHELPER_MARK_ENTRY(); - sh.register_user_sig_handler([](int sig) { signal_handler(sig); }); + sh.register_user_sig_handler([](int sig) { msignal_handler(sig); }); #endif #ifdef _WIN32 @@ -73,4 +73,4 @@ int main(int argc, char* argv[]) } io_context.run(); return 0; -} \ No newline at end of file +}