Changeset 88740 in vbox for trunk/src/VBox

Timestamp:

Apr 27, 2021 4:52:17 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161: Rework commit data request handling; GUI should NOT initiate state saving itself, VBoxSVC can do it itself; Moreover, if not VBoxSVC, VBoxHeadless would be forced to do it in separate/headless cases.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UICommon.cpp (modified) (2 diffs)
• UIStarter.cpp (modified) (3 diffs)
• UIStarter.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -4693 +4693 @@
 void UICommon::sltHandleCommitDataRequest(QSessionManager &manager)
 {
-    LogRel(("GUI: UICommon::sltHandleCommitDataRequest: Emergency shutdown initiated\n"));
+    LogRel(("GUI: UICommon: Commit data request..\n"));
 
     /* Ask listener to commit data: */
@@ -4707 +4707 @@
         case UIType_RuntimeUI:
         {
-            // WORKAROUND:
-            // We can't save VM state in one go, so we have to ask session manager to postpone shutdown until we done..
-            manager.cancel();
+            /* Thin clients will be able to shutdown properly,
+             * but for fat clients: */
+            if (!isSeparateProcess())
+            {
+                // WORKAROUND:
+                // We can't save VM state in one go for fat clients, so we have to ask session manager to cancel shutdown.
+                // To next major release this should be removed in any case, since there will be no fat clients after all.
+                manager.cancel();
 
 #ifdef VBOX_WS_WIN
-            // WORKAROUND:
-            // In theory that's Qt5 who should allow us to provide postponing reason as well, but that functionality
-            // seems missed in Windows platform plugin, so we are making that ourselves.  That also implies that since
-            // we had postponed a shutdown process, host will send us WM_QUIT to allow to properly do an application
-            // cleanup first. That signal will cause QApplication to quit().
-            ShutdownBlockReasonCreateAPI((HWND)windowManager().mainWindowShown()->winId(), L"Shutdown in progress...");
+                // WORKAROUND:
+                // In theory that's Qt5 who should allow us to provide canceling reason as well, but that functionality
+                // seems to be missed in Windows platform plugin, so we are making that ourselves.
+                ShutdownBlockReasonCreateAPI((HWND)windowManager().mainWindowShown()->winId(), L"VM is still running.");
 #endif
+            }
 
             break;

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIStarter.cpp

@@ -76 +76 @@
     connect(&uiCommon(), &UICommon::sigAskToCloseUI,
             this, &UIStarter::sltCloseUI);
-    connect(&uiCommon(), &UICommon::sigAskToCommitData,
-            this, &UIStarter::sltHandleCommitDataRequest);
 }
 
@@ -87 +85 @@
     disconnect(&uiCommon(), &UICommon::sigAskToCloseUI,
                this, &UIStarter::sltCloseUI);
-    disconnect(&uiCommon(), &UICommon::sigAskToCommitData,
-               this, &UIStarter::sltHandleCommitDataRequest);
 }
 
@@ -159 +155 @@
 #endif
 }
-
-void UIStarter::sltHandleCommitDataRequest()
-{
-    /* Exit if UICommon is not valid: */
-    if (!uiCommon().isValid())
-        return;
-
-#ifdef VBOX_RUNTIME_UI
-    /* Only for the case when we have this request
-     * earlier than the usual cleanup started: */
-    if (!UICommon::isCleaningUp())
-        gpMachine->uisession()->saveState();
-#endif
-}

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIStarter.h

@@ -60 +60 @@
     void sltCloseUI();
 
-    /** Handles commit data request. */
-    void sltHandleCommitDataRequest();
-
 private: