fix: don't trigger multiple messagebox windows

Swung0x48 · Nov 24, 2023 · 23692df · 23692df
1 parent db7a154
commit 23692df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/BallanceMMOClient/dumpfile.cpp b/BallanceMMOClient/dumpfile.cpp
@@ -88,6 +88,7 @@ namespace NSDumpFile {
     }
 
     std::function<void(std::string&)> CrashCallback{};
+    static bool messageBoxTriggered = false;
 
     LONG WINAPI UnhandledExceptionFilterEx(struct ::_EXCEPTION_POINTERS* pException)
     {
@@ -112,6 +113,8 @@ namespace NSDumpFile {
         CreateDumpFile(szFileName, pException);
 
         // TODO: MiniDumpWriteDump
+        if (messageBoxTriggered)
+            return EXCEPTION_CONTINUE_SEARCH;
         std::string extraText;
         CrashCallback(extraText);
         if (!extraText.empty())
@@ -142,6 +145,7 @@ namespace NSDumpFile {
         //FatalAppExit(-1, extraText.c_str());
         char basename[128];
         GetModuleBaseName(GetCurrentProcess(), NULL, basename, sizeof(basename));
+        messageBoxTriggered = true;
         MessageBox(NULL, extraText.c_str(),
                         (basename + std::string{" - Fatal Application Exit"}).c_str(),
                         MB_OK | MB_ICONERROR | MB_SYSTEMMODAL | MB_SETFOREGROUND | MB_SERVICE_NOTIFICATION);

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,8 +31,8 @@ project(${PROJECT_NAME})
 # endif()
 
 set(BMMO_VER_DEFINED 1)
-set(BMMO_VER            3.5.7-beta16)
-set(BMMO_MIN_CLIENT_VER 3.5.7-beta16)
+set(BMMO_VER            3.5.7-beta17)
+set(BMMO_MIN_CLIENT_VER 3.5.7-beta17)
 set(CONFIG_DIR ${CMAKE_CURRENT_LIST_DIR}/BallanceMMOCommon/include/config)
 configure_file(${CONFIG_DIR}/version_config.h.in ${CONFIG_DIR}/version_config.h @ONLY)