imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-28 07:47:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

impr: Make crash handling from non-main threads more resilient

Browse Source
This commit is contained in:
WerWolv
2025-08-27 23:53:46 +02:00
parent abffb8c138
commit bd9e9a7dcf
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
main/gui/source/crash_handlers.cpp
View File

@@ -77,7 +77,18 @@ namespace hex::crash {
} }
} }
extern "C" void triggerSafeShutdown(int signalNumber = 0) { extern "C" [[noreturn]] void triggerSafeShutdown(int signalNumber = 0) {
if (!TaskManager::isMainThread()) {
log::error("Terminating from non-main thread, scheduling termination on main thread");
TaskManager::doLater([signalNumber] {
triggerSafeShutdown(signalNumber);
});
while (true) {
std::this_thread::sleep_for(std::chrono::milliseconds(100));
}
}
// Trigger an event so that plugins can handle crashes // Trigger an event so that plugins can handle crashes
EventAbnormalTermination::post(signalNumber); EventAbnormalTermination::post(signalNumber);
@@ -168,7 +179,10 @@ namespace hex::crash {
// Print the current exception info // Print the current exception info
try { try {
std::rethrow_exception(std::current_exception()); if (std::uncaught_exceptions() > 0)
std::rethrow_exception(std::current_exception());
else
log::fatal("std::terminate() called without an active exception");
} catch (std::exception &ex) { } catch (std::exception &ex) {
std::string exceptionStr = fmt::format("{}()::what() -> {}", trace::demangle(typeid(ex).name()), ex.what()); std::string exceptionStr = fmt::format("{}()::what() -> {}", trace::demangle(typeid(ex).name()), ex.what());