summaryrefslogtreecommitdiffstats
path: root/src/server/serverapp/serverapp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/serverapp/serverapp.cpp')
-rw-r--r--src/server/serverapp/serverapp.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/server/serverapp/serverapp.cpp b/src/server/serverapp/serverapp.cpp
index 933517b..900d3a4 100644
--- a/src/server/serverapp/serverapp.cpp
+++ b/src/server/serverapp/serverapp.cpp
@@ -1,11 +1,12 @@
+#include "../mainwindow/mainwindow.h"
+#include "serverapp.h"
+#include "../../shared/util.h"
+
#include <QTranslator>
#include <QNetworkInterface>
#include <QSettings>
#include <QLibraryInfo>
-#include "serverapp.h"
-#include "../../shared/util.h"
-
static QSize minimalGridSize(const QMap<QString, QPoint>& clientPositions, QSize& clientSize);
ServerApp::ServerApp(int& argc, char** argv)
@@ -21,8 +22,8 @@ ServerApp::ServerApp(int& argc, char** argv)
// If started in manager-only mode, and there is no current room
// after reading the config, exit right away
- if (_managerOnly && _currentRoom == "") {
- QApplication::exit(0);
+ if (_managerOnly && _currentRoom.isEmpty()) {
+ _doExit = true;
return;
}