Changeset 64217 in vbox for trunk

Timestamp:

Oct 12, 2016 10:26:52 AM (8 years ago)

Author:

vboxsync

Message:

Main/Snapshot: fix regression in previous fix (i_deparent may only be called for objects which do have a parent, and with the current diff image merging/deleting code, especially the error cases, it's unpredictable if the deparenting was already done or not)

File:

• trunk/src/VBox/Main/src-server/SnapshotImpl.cpp (modified) (1 diff)

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

@@ -3130 +3130 @@
                 // make sure that the diff image to be deleted has no parent,
                 // even in error cases (where the deparenting may be missing)
-                it->mpSource->i_deparent();
+                if (it->mpSource->i_getParent())
+                    it->mpSource->i_deparent();
                 it->mpSource->uninit();
             }