Changeset 88657 in vbox

Timestamp:

Apr 22, 2021 3:11:09 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161: Rework host logoff handling; VirtualBox Manager is now able to properly shutdown itself, Runtime UI still requires to postpone shutdown until VM state is saved; We now also call for VM state saving functionality directly.

Location:

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

Files:

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

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

@@ -4081 +4081 @@
 {
     /* Make sure QApplication cleanup us on exit: */
+    qApp->setFallbackSessionManagementEnabled(false);
     connect(qApp, &QGuiApplication::aboutToQuit,
             this, &UICommon::cleanup);
@@ -4699 +4700 @@
 #endif
 
-    /* Ask session manager to postpone shutdown until we done: */
-    manager.cancel();
+    /* Depending on UI type: */
+    switch (uiType())
+    {
+        /* For Runtime UI: */
+        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();
 
 #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 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...");
 #endif
+
+            break;
+        }
+        default:
+            break;
+    }
 }
 #endif /* VBOX_GUI_WITH_CUSTOMIZATIONS1 */

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

@@ -167 +167 @@
 
 #ifdef VBOX_RUNTIME_UI
-    /* Temporary override the default close action to 'SaveState' if necessary: */
-    if (gpMachine->uisession()->defaultCloseAction() == MachineCloseAction_Invalid)
-        gpMachine->uisession()->setDefaultCloseAction(MachineCloseAction_SaveState);
+    gpMachine->uisession()->saveState();
 #endif
 }