Make sure the message handlers block

dubhater · Jan 26, 2016 · 1269d08 · 1269d08
1 parent ee88793
commit 1269d08
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/wibbly/WibblyWindow.cpp b/src/wibbly/WibblyWindow.cpp
@@ -34,6 +34,7 @@ SOFTWARE.
 #include <QScrollArea>
 #include <QShortcut>
 #include <QStatusBar>
+#include <QThread>
 
 #include <QHBoxLayout>
 #include <QVBoxLayout>
@@ -92,7 +93,13 @@ WibblyWindow::WibblyWindow()
 void VS_CC messageHandler(int msgType, const char *msg, void *userData) {
     WibblyWindow *window = (WibblyWindow *)userData;
 
-    QMetaObject::invokeMethod(window, "vsLogPopup", Qt::QueuedConnection, Q_ARG(int, msgType), Q_ARG(void *, (void *)msg));
+    Qt::ConnectionType type;
+    if (QThread::currentThread() == window->thread())
+        type = Qt::DirectConnection;
+    else
+        type = Qt::BlockingQueuedConnection;
+
+    QMetaObject::invokeMethod(window, "vsLogPopup", type, Q_ARG(int, msgType), Q_ARG(void *, (void *)msg));
 }
 
 

diff --git a/src/wobbly/WobblyWindow.cpp b/src/wobbly/WobblyWindow.cpp
@@ -34,6 +34,7 @@ SOFTWARE.
 #include <QSpinBox>
 #include <QStatusBar>
 #include <QTabWidget>
+#include <QThread>
 
 #include <QHBoxLayout>
 #include <QVBoxLayout>
@@ -2388,7 +2389,13 @@ void WobblyWindow::createUI() {
 void VS_CC messageHandler(int msgType, const char *msg, void *userData) {
     WobblyWindow *window = (WobblyWindow *)userData;
 
-    QMetaObject::invokeMethod(window, "vsLogPopup", Qt::QueuedConnection, Q_ARG(int, msgType), Q_ARG(void *, (void *)msg));
+    Qt::ConnectionType type;
+    if (QThread::currentThread() == window->thread())
+        type = Qt::DirectConnection;
+    else
+        type = Qt::BlockingQueuedConnection;
+
+    QMetaObject::invokeMethod(window, "vsLogPopup", type, Q_ARG(int, msgType), Q_ARG(void *, (void *)msg));
 }