UI: Refactor restart requesting

src/ui/fortmanager.cpp

@@ -425,12 +425,9 @@ void FortManager::processRestartRequired()
     auto settings = IoC<FortSettings>();
 
     if (settings->isService()) {
-        IoC<ServiceManager>()->restart();
+        IoC<ServiceManager>()->processRestartRequired();
     } else {
-        auto windowManager = IoC<WindowManager>();
-
-        windowManager->showConfirmBox(
-                [=] { windowManager->restart(); }, tr("Restart Now?"), tr("Restart Required"));
+        IoC<WindowManager>()->processRestartRequired();
     }
 }
 

src/ui/manager/servicemanager.cpp

@@ -129,9 +129,11 @@ void ServiceManager::processControl(quint32 code, quint32 eventType)
     reportStatus(state);
 }
 
-void ServiceManager::restart()
+void ServiceManager::processRestartRequired()
 {
     qCDebug(LC) << "Quit due required restart";
 
     QCoreApplication::quit();
+
+    reportStatus(SERVICE_STOP_PENDING);
 }

src/ui/manager/servicemanager.h

@@ -30,7 +30,7 @@ public:
 
     void processControl(quint32 code, quint32 eventType) override;
 
-    void restart();
+    void processRestartRequired();
 
 signals:
     void pauseRequested();

src/ui/manager/windowmanager.cpp

@@ -501,6 +501,11 @@ void WindowManager::restart()
     QCoreApplication::quit();
 }
 
+void WindowManager::processRestartRequired()
+{
+    showConfirmBox([&] { restart(); }, tr("Restart Now?"), tr("Restart Required"));
+}
+
 bool WindowManager::checkWindowPassword(WindowCode code)
 {
     return (WindowPasswordProtected & code) == 0 || checkPassword();

src/ui/manager/windowmanager.h

@@ -105,6 +105,7 @@ public slots:
 
     void quit();
     void restart();
+    void processRestartRequired();
 
     bool checkWindowPassword(WindowCode code);
     bool checkPassword();