Changeset 88664 in vbox

Timestamp:

Apr 22, 2021 6:34:11 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161: A fix for regression caused by r143970 and r143971; Do not ask to save VM state in usual shutdown sequence, only in session manager logoff sequence.

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

@@ -4577 +4577 @@
     LogRel(("GUI: UICommon: Handling aboutToQuit request..\n"));
 
+    /// @todo Shouldn't that be protected with a mutex or something?
+    /* Remember that the cleanup is in progress preventing any unwanted
+     * stuff which could be called from the other threads: */
+    s_fCleaningUp = true;
+
 #ifdef VBOX_WS_WIN
     /* Ask listeners to commit data if haven't yet: */
@@ -4588 +4593 @@
     emit sigAskToCommitData();
 #endif
-
-    /// @todo Shouldn't that be protected with a mutex or something?
-    /* Remember that the cleanup is in progress preventing any unwanted
-     * stuff which could be called from the other threads: */
-    s_fCleaningUp = true;
 
 #ifdef VBOX_WITH_DEBUGGER_GUI

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

@@ -167 +167 @@
 
 #ifdef VBOX_RUNTIME_UI
-    gpMachine->uisession()->saveState();
+    /* Only for the case when we have this request
+     * earlier than the usual cleanup started: */
+    if (!UICommon::isCleaningUp())
+        gpMachine->uisession()->saveState();
 #endif
 }