Changeset 7894 in vbox for trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp

Timestamp:

Apr 11, 2008 7:40:42 AM (17 years ago)

Author:

vboxsync

Message:

VDI: Skip flushing the image if the open wasn't successful.

File:

• trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp

@@ -688 +688 @@
     Assert(VALID_PTR(pImage));
 
-    vdiFlushImage(pImage);
     if (pImage->File != NIL_RTFILE)
     {
+        vdiFlushImage(pImage);
         RTFileClose(pImage->File);
         pImage->File = NIL_RTFILE;
@@ -725 +725 @@
     }
     pImage->pszFilename = pszFilename;
+    pImage->File = NIL_RTFILE;
+    pImage->paBlocks = NULL;
+    pImage->pfnError = NULL;
+    pImage->pvErrorUser = NULL;
 
     rc = vdiOpenImage(pImage, VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_READONLY);
@@ -765 +769 @@
     }
     pImage->pszFilename = pszFilename;
+    pImage->File = NIL_RTFILE;
     pImage->paBlocks = NULL;
     pImage->pfnError = pfnError;
@@ -819 +824 @@
     }
     pImage->pszFilename = pszFilename;
+    pImage->File = NIL_RTFILE;
     pImage->paBlocks = NULL;
     pImage->pfnError = pfnError;