From 3673317ff514b4b50ab619ac0636accfcb7a57c4 Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Thu, 29 Mar 2018 17:18:11 +0200 Subject: Make sure to handle openUrl requests in the main thread Change-Id: If065f14517e3445b0f1a16b1d750aa9e6f569e1d Reviewed-by: Dominik Holland --- src/manager-lib/applicationmanager.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/manager-lib/applicationmanager.cpp b/src/manager-lib/applicationmanager.cpp index 6af11897..29a46b9e 100644 --- a/src/manager-lib/applicationmanager.cpp +++ b/src/manager-lib/applicationmanager.cpp @@ -46,6 +46,7 @@ #include #include #include +#include #include #if defined(QT_GUI_LIB) # include @@ -1424,6 +1425,10 @@ void ApplicationManager::shutDown() void ApplicationManager::openUrlRelay(const QUrl &url) { + if (QThread::currentThread() != thread()) { + staticMetaObject.invokeMethod(this, "openUrlRelay", Qt::QueuedConnection, Q_ARG(QUrl, url)); + return; + } openUrl(url.toString()); } -- cgit v1.2.3