Changeset 67433 in vbox for trunk/src/VBox/Main

Timestamp:

Jun 16, 2017 8:21:10 AM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

116163

Message:

Main/Snapshot: Pass the restored snapshot ID as part of the event, for consistency. The old behavior (always passing a zero uuid) was an artifact from the days when snapshot restoring was signaled as a snapshot deletion with zero uuid.

File:

• trunk/src/VBox/Main/src-server/SnapshotImpl.cpp (modified) (3 diffs)

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

@@ -2111 +2111 @@
 
     HRESULT rc = S_OK;
+    Guid snapshotId;
 
     try
@@ -2149 +2150 @@
             /* remember the timestamp of the snapshot we're restoring from */
             snapshotTimeStamp = task.m_pSnapshot->i_getTimeStamp();
+
+            // save the snapshot ID (paranoia, here we hold the lock)
+            snapshotId = task.m_pSnapshot->i_getId();
 
             ComPtr<SnapshotMachine> pSnapshotMachine(task.m_pSnapshot->i_getSnapshotMachine());
@@ -2333 +2337 @@
 
     if (SUCCEEDED(rc))
-        mParent->i_onSnapshotRestored(mData->mUuid, Guid());
+        mParent->i_onSnapshotRestored(mData->mUuid, snapshotId);
 
     LogFlowThisFunc(("Done restoring snapshot (rc=%08X)\n", rc));