Changeset 35915 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Feb 9, 2011 3:04:32 PM (14 years ago)

Author:

vboxsync

Message:

Main: fix broken snapshots when disk images are shared between several machines

Location:

trunk/src/VBox/Main/src-server

Files:

• MediumImpl.cpp (modified) (1 diff)
• SnapshotImpl.cpp (modified) (2 diffs)

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

@@ -6208 +6208 @@
     bool fGenerateUuid = false;
 
-    GuidList llRegistriesThatNeedSaving;
+    GuidList llRegistriesThatNeedSaving;        // gets copied to task pointer later in synchronous mode
 
     try

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

@@ -1489 +1489 @@
                                vrc);
         }
+
+        // if we got this far without an error, then save the media registries
+        // that got modified for the diff images
+        alock.release();
+        mParent->saveRegistries(llRegistriesThatNeedSaving);
     }
     catch (HRESULT hrc)
@@ -1514 +1519 @@
     else
         *aStateFilePath = NULL;
-
-    // @todo r=dj normally we would need to save the settings if fNeedsGlobalSaveSettings was set to true,
-    // but since we have no error handling that cleans up the diff image that might have gotten created,
-    // there's no point in saving the disk registry at this point either... this needs fixing.
 
     LogFlowThisFunc(("LEAVE - %Rhrc [%s]\n", rc, Global::stringifyMachineState(mData->mMachineState) ));