mac do not touch main thread dispatcher

VelorumS · Apr 9, 2017 · d577f56 · d577f56
1 parent 2ad89bd
commit d577f56
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/libopenage/gui/guisys/private/gui_application_impl.cpp b/libopenage/gui/guisys/private/gui_application_impl.cpp
@@ -26,7 +26,9 @@ GuiApplicationImpl::~GuiApplicationImpl() {
 
 void GuiApplicationImpl::processEvents() {
 	assert(std::this_thread::get_id() == this->owner);
+#ifndef __APPLE__
 	this->app.processEvents();
+#endif
 }
 
 namespace {

diff --git a/libopenage/gui/guisys/private/gui_event_queue_impl.cpp b/libopenage/gui/guisys/private/gui_event_queue_impl.cpp
@@ -6,6 +6,10 @@
 
 #include <QThread>
 
+#ifdef __APPLE__
+#include <QCoreApplication>
+#endif
+
 #include "../public/gui_event_queue.h"
 
 namespace qtsdl {
@@ -24,7 +28,12 @@ GuiEventQueueImpl* GuiEventQueueImpl::impl(GuiEventQueue *event_queue) {
 
 void GuiEventQueueImpl::process_callbacks() {
 	assert(QThread::currentThread() == this->thread);
+#ifdef __APPLE__
+	if (QThread::currentThread() != QCoreApplication::instance()->thread())
+		this->callback_processor.processEvents();
+#else
 	this->callback_processor.processEvents();
+#endif
 }
 
 QThread* GuiEventQueueImpl::get_thread() {