Changeset 28870 in vbox for trunk/src/VBox

Timestamp:

Apr 28, 2010 2:33:11 PM (15 years ago)

Author:

vboxsync

Message:

VBoxManage/snapshot: fixed selection of snapshots by name (regression from UUID => Bstr)

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageSnapshot.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageSnapshot.cpp

@@ -421 +421 @@
             {
                 /* assume it's a UUID */
-                Bstr guidSnap(a->argv[2]);
-                if (!guidSnap.isEmpty())
-                {
-                    CHECK_ERROR_BREAK(pMachine, GetSnapshot(guidSnap, snapshot.asOutParam()));
-                }
-                else
+                rc = pMachine->GetSnapshot(Bstr(a->argv[2]), snapshot.asOutParam());
+                if (FAILED(rc) || !snapshot)
                 {
                     /* then it must be a name */
@@ -484 +480 @@
 
             /* assume it's a UUID */
-            Bstr guidSnap(a->argv[2]);
-            if (!guidSnap.isEmpty())
-            {
-                CHECK_ERROR_BREAK(pMachine, GetSnapshot(guidSnap, snapshot.asOutParam()));
-            }
-            else
+            rc = pMachine->GetSnapshot(Bstr(a->argv[2]), snapshot.asOutParam());
+            if (FAILED(rc) || !snapshot)
             {
                 /* then it must be a name */