Allow to disable crash catcher on Windows

post_malone
elsid 3 years ago
parent ebdcb7acbd
commit d2ed62ec3a
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625

@ -560,9 +560,6 @@ static bool is_debugger_present()
void crashCatcherInstall(int argc, char **argv, const std::string &crashLogPath)
{
if (const auto env = std::getenv("OPENMW_DISABLE_CRASH_CATCHER"))
if (std::atol(env) != 0)
return;
if ((argc == 2 && strcmp(argv[1], crash_switch) == 0) || !is_debugger_present())
{
int s[5] = { SIGSEGV, SIGILL, SIGFPE, SIGBUS, SIGABRT };

@ -314,6 +314,8 @@ int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, c
setupLogging(cfgMgr.getLogPath().string(), appName, mode);
}
if (const auto env = std::getenv("OPENMW_DISABLE_CRASH_CATCHER"); env == nullptr || std::atol(env) == 0)
{
#if defined(_WIN32)
const std::string crashLogName = Misc::StringUtils::lowerCase(appName) + "-crash.dmp";
Crash::CrashCatcher crashy(argc, argv, (cfgMgr.getLogPath() / crashLogName).make_preferred().string());
@ -325,6 +327,9 @@ int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, c
#endif
ret = innerApplication(argc, argv);
}
else
ret = innerApplication(argc, argv);
}
catch (const std::exception& e)
{
#if (defined(__APPLE__) || defined(__linux) || defined(__unix) || defined(__posix))

Loading…
Cancel
Save