flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-18 11:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reorder log handler thread check to happen before the Win32 messagebox

Browse Source
This commit is contained in:
Mat Sutcliffe
2021-05-24 19:52:50 +01:00
parent 1e347230d1
commit d4991e9d72
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackmisc/loghandler.cpp
View File

@@ -47,6 +47,13 @@ namespace BlackMisc
{ {
const CStatusMessage statusMessage(type, context, message); const CStatusMessage statusMessage(type, context, message);
const auto invokee = [statusMessage] { CLogHandler::instance()->logLocalMessage(statusMessage); }; const auto invokee = [statusMessage] { CLogHandler::instance()->logLocalMessage(statusMessage); };
if (type == QtFatalMsg && CLogHandler::instance()->thread() != QThread::currentThread())
{
// Fatal message means this thread is about to crash the application. A queued connection would be useless.
// Blocking queued connection means we pause this thread just long enough to let the main thread handle the message.
QMetaObject::invokeMethod(CLogHandler::instance(), invokee, Qt::BlockingQueuedConnection);
return;
}
#if defined(Q_CC_MSVC) && defined(QT_NO_DEBUG) #if defined(Q_CC_MSVC) && defined(QT_NO_DEBUG)
if (type == QtFatalMsg) if (type == QtFatalMsg)
{ {
@@ -56,13 +63,6 @@ namespace BlackMisc
# endif # endif
} }
#endif #endif
if (type == QtFatalMsg && CLogHandler::instance()->thread() != QThread::currentThread())
{
// Fatal message means this thread is about to crash the application. A queued connection would be useless.
// Blocking queued connection means we pause this thread just long enough to let the main thread handle the message.
QMetaObject::invokeMethod(CLogHandler::instance(), invokee, Qt::BlockingQueuedConnection);
return;
}
QMetaObject::invokeMethod(CLogHandler::instance(), invokee); QMetaObject::invokeMethod(CLogHandler::instance(), invokee);
} }