Changeset 100179 in vbox

Timestamp:

Jun 15, 2023 12:30:32 PM (18 months ago)

Author:

vboxsync

Message:

Main/Machine: If IMachine::discardSavedState() is called for a VM in the
'AbortedSaved' state then the machine state is correctly moved to
'Powered Off' but the saved state file isn't deleted due to a missing
check for this machine state transition in SessionMachine::i_setMachineState().
bugref:1484 bugref:10471

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -15297 +15297 @@
                )
                 && aMachineState   == MachineState_Restoring
-            )
+           )
         || (   (   oldMachineState == MachineState_PoweredOff
                 || oldMachineState == MachineState_Teleported
@@ -15327 +15327 @@
                  || oldMachineState == MachineState_TeleportingPausedVM
                  || oldMachineState == MachineState_TeleportingIn
-                 )
+                )
              && (   aMachineState == MachineState_PoweredOff
                  || aMachineState == MachineState_Saved
@@ -15358 +15358 @@
         }
     }
-    else if (   oldMachineState == MachineState_Saved
+    else if (   (   oldMachineState == MachineState_Saved
+                 || oldMachineState == MachineState_AbortedSaved
+                )
              && (   aMachineState == MachineState_PoweredOff
                  || aMachineState == MachineState_Teleported
@@ -15364 +15366 @@
             )
     {
-        /* delete the saved state after SessionMachine::ForgetSavedState() is called */
+        /* delete the saved state after SessionMachine::discardSavedState() is called */
         deleteSavedState = true;
         mData->mCurrentStateModified = TRUE;