Changeset 18901 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 15, 2009 12:04:59 PM (16 years ago)

Author:

vboxsync

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

45956

Message:

VBoxManage: fix the relative path name hack, it issued bogus errors for the API interpretation of relative path names.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.cpp (modified) (1 diff)
• VBoxManageDisk.cpp (modified) (3 diffs)

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

@@ -216 +216 @@
         CHECK_ERROR(a->virtualBox, OpenMachine(Bstr(szVMFileAbs), machine.asOutParam()));
     }
-    else
+    else if (FAILED(rc))
         CHECK_ERROR(a->virtualBox, OpenMachine(Bstr(a->argv[0]), machine.asOutParam()));
     if (SUCCEEDED(rc))

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

@@ -1283 +1283 @@
             CHECK_ERROR(a->virtualBox, OpenHardDisk(Bstr(szFilenameAbs), AccessMode_ReadWrite, hardDisk.asOutParam()));
         }
-        else
+        else if (FAILED(rc))
             CHECK_ERROR(a->virtualBox, OpenHardDisk(Bstr(Filename), AccessMode_ReadWrite, hardDisk.asOutParam()));
         if (SUCCEEDED(rc) && hardDisk)
@@ -1311 +1311 @@
             CHECK_ERROR(a->virtualBox, OpenDVDImage(Bstr(szFilenameAbs), Guid(), dvdImage.asOutParam()));
         }
-        else
+        else if (FAILED(rc))
             CHECK_ERROR(a->virtualBox, OpenDVDImage(Bstr(Filename), Guid(), dvdImage.asOutParam()));
     }
@@ -1331 +1331 @@
             CHECK_ERROR(a->virtualBox, OpenFloppyImage(Bstr(szFilenameAbs), Guid(), floppyImage.asOutParam()));
         }
-        else
+        else if (FAILED(rc))
             CHECK_ERROR(a->virtualBox, OpenFloppyImage(Bstr(Filename), Guid(), floppyImage.asOutParam()));
     }