Don't use QTimer in dispatchToMain (#1237)

IB-7904 Signed-off-by: Raul Metsma <raul@metsma.ee>
open-eid · Dec 1, 2023 · e321e6f · e321e6f
1 parent 13f107a
commit e321e6f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/client/Application.cpp b/client/Application.cpp
@@ -444,9 +444,7 @@ Application::Application( int &argc, char **argv )
 				Q_EMIT qApp->TSLLoadingFinished();
 				qApp->d->ready = true;
 				if(ex) {
-					dispatchToMain([ex] {
-						showWarning(tr("Failed to initalize."), *ex);
-					});
+					dispatchToMain(showWarning, tr("Failed to initalize."), *ex);
 				}
 			}
 		);

diff --git a/client/Utils.h b/client/Utils.h
@@ -49,25 +49,18 @@ namespace {
 	template <typename F, class... Args>
 	inline auto dispatchToMain(F&& function, Args&& ...args) {
 		QEventLoop l;
-		QTimer *timer = new QTimer();
-		timer->moveToThread(qApp->thread());
-		timer->setSingleShot(true);
 		if constexpr (std::is_void_v<std::invoke_result_t<F,Args...>>) {
-			QObject::connect(timer, &QTimer::timeout, timer, [&, function = std::forward<F>(function)] {
+			QMetaObject::invokeMethod(qApp, [&, function = std::forward<F>(function)] {
 				std::invoke(function, args...);
 				l.exit();
-				timer->deleteLater();
-			});
-			QMetaObject::invokeMethod(timer, [timer] { timer->start(0); }, Qt::QueuedConnection);
+			}, Qt::QueuedConnection);
 			l.exec();
 		} else {
 			std::invoke_result_t<F,Args...> result{};
-			QObject::connect(timer, &QTimer::timeout, timer, [&, function = std::forward<F>(function)] {
+			QMetaObject::invokeMethod(qApp, [&, function = std::forward<F>(function)] {
 				result = std::invoke(function, args...);
 				l.exit();
-				timer->deleteLater();
-			});
-			QMetaObject::invokeMethod(timer, [timer] { timer->start(0); }, Qt::QueuedConnection);
+			}, Qt::QueuedConnection);
 			l.exec();
 			return result;
 		}