From ab0a11f177091855d9c6488ab999daeadc6e9b9c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 20 Jan 2023 11:21:56 +0100
Subject: [pvsmgr] Fix app-exit in --manager-only mode on Qt5.15

In newer Qt versions, calling QApplication::exit() in the
App constructor deadlocks the application. Set a flag
instead and exit from main()
---
 src/server/serverapp/serverapp.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/server/serverapp/serverapp.h')

diff --git a/src/server/serverapp/serverapp.h b/src/server/serverapp/serverapp.h
index b2b16c5..3cb40b5 100644
--- a/src/server/serverapp/serverapp.h
+++ b/src/server/serverapp/serverapp.h
@@ -1,8 +1,6 @@
 #ifndef SERVERAPP_H
 #define SERVERAPP_H
 
-#include "../mainwindow/mainwindow.h"
-
 #include <QApplication>
 #include <QStringList>
 #include <QMap>
@@ -49,6 +47,7 @@ private:
 	QByteArray _sessionNameArray;
 	QMap<QString, Room*> _rooms;
 	QString _currentRoom;
+	bool _doExit{};
 
 	bool _managerOnly{};
 	bool _isExam{};
@@ -78,6 +77,8 @@ public:
 	void setCurrentRoom(const QString& room) { _currentRoom = room; }
 	void setExam(bool exam) { _isExam = exam; }
 
+	bool shouldExit() const { return _doExit; }
+
 };
 
 #endif
-- 
cgit v1.2.3-55-g7522