From c2ad8d47d382c7460bb54c8a7116573d95648f95 Mon Sep 17 00:00:00 2001 From: Brad Parker Date: Sat, 5 May 2018 22:57:29 -0400 Subject: [PATCH] Qt: only check for pending events of the main thread --- ui/drivers/qt/ui_qt_application.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ui/drivers/qt/ui_qt_application.cpp b/ui/drivers/qt/ui_qt_application.cpp index e8a73a6e9f..f52059395d 100644 --- a/ui/drivers/qt/ui_qt_application.cpp +++ b/ui/drivers/qt/ui_qt_application.cpp @@ -15,6 +15,7 @@ */ #include +#include extern "C" { #include "../../ui_companion_driver.h" @@ -144,13 +145,18 @@ static void* ui_application_qt_initialize(void) static bool ui_application_qt_pending_events(void) { - return QApplication::hasPendingEvents(); + QAbstractEventDispatcher *dispatcher = QApplication::eventDispatcher(); + + if (dispatcher) + return dispatcher->hasPendingEvents(); + + return false; } static void ui_application_qt_process_events(void) { - if(ui_application_qt_pending_events()) - QApplication::processEvents(); + if (ui_application_qt_pending_events()) + QApplication::processEvents(); } static void ui_application_qt_quit(void)