ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-13 12:14:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: use global for VEH mutex

Browse source 
attempts to fix stack overflow when debugging in VS
This commit is contained in:
goat 2022-08-17 20:22:21 +02:00
parent 4d0aadb943
commit 951118ceb6
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Dalamud.Boot/veh.cpp
View file

@ -24,9 +24,12 @@
PVOID g_veh_handle = nullptr; PVOID g_veh_handle = nullptr;
bool g_veh_do_full_dump = false; bool g_veh_do_full_dump = false;
HANDLE g_crashhandler_process = nullptr; HANDLE g_crashhandler_process = nullptr;
HANDLE g_crashhandler_pipe_write = nullptr; HANDLE g_crashhandler_pipe_write = nullptr;
std::recursive_mutex g_exception_handler_mutex;
std::chrono::time_point<std::chrono::system_clock> g_time_start; std::chrono::time_point<std::chrono::system_clock> g_time_start;
bool is_whitelist_exception(const DWORD code) bool is_whitelist_exception(const DWORD code)
@ -126,8 +129,6 @@ static void append_injector_launch_args(std::vector<std::wstring>& args)
LONG exception_handler(EXCEPTION_POINTERS* ex) LONG exception_handler(EXCEPTION_POINTERS* ex)
{ {
static std::recursive_mutex s_exception_handler_mutex;
if (ex->ExceptionRecord->ExceptionCode == 0x12345678) if (ex->ExceptionRecord->ExceptionCode == 0x12345678)
{ {
// pass // pass
@ -143,7 +144,7 @@ LONG exception_handler(EXCEPTION_POINTERS* ex)
} }
// block any other exceptions hitting the veh while the messagebox is open // block any other exceptions hitting the veh while the messagebox is open
const auto lock = std::lock_guard(s_exception_handler_mutex); const auto lock = std::lock_guard(g_exception_handler_mutex);
exception_info exinfo{}; exception_info exinfo{};
exinfo.pExceptionPointers = ex; exinfo.pExceptionPointers = ex;