Changeset 23187 in vbox for trunk

Timestamp:

Sep 21, 2009 12:51:05 PM (15 years ago)

Author:

vboxsync

Message:

SessionMachine::EndTakingSnapshot: Don't restore the state to Running. This is a new situation for live save and will be documented / cleaned up later to avoid causing unnecessary conflicts.

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -196 +196 @@
     mClipboardMode = ClipboardMode_Bidirectional;
     mGuestPropertyNotificationPatterns = "";
-    
+
     mFirmwareType = FirmwareType_Bios;
 }
@@ -5655 +5655 @@
         mData->m_pMachineConfigFile->strDescription = mUserData->mDescription;
         mData->m_pMachineConfigFile->strOsType = mUserData->mOSTypeId;
-        
+
         if (    mData->mMachineState == MachineState_Saved
              || mData->mMachineState == MachineState_Restoring
@@ -8147 +8147 @@
      * (this is expected by Console::TakeSnapshot() and
      * Console::saveStateThread()) */
-    setMachineState(mSnapshotData.mLastState);
+    if (mSnapshotData.mLastState != Running) /** @todo Live Save: Quick hack. */
+        setMachineState(mSnapshotData.mLastState);
 
     return endTakingSnapshot(aSuccess);