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

Timestamp:

Mar 24, 2010 6:28:43 PM (15 years ago)

Author:

vboxsync

Message:

Main/Machine: fix resource leak introduced by last change.

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -350 +350 @@
             RTFILE f = NIL_RTFILE;
             int vrc = RTFileOpen(&f, mData->m_strConfigFileFull.c_str(), RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
-            if (    (RT_SUCCESS(vrc) && !aOverride)
+            if (    RT_SUCCESS(vrc)
                  || vrc == VERR_SHARING_VIOLATION
                )
             {
-                rc = setError(VBOX_E_FILE_ERROR,
-                              tr("Machine settings file '%s' already exists"),
-                              mData->m_strConfigFileFull.raw());
+                if (!aOverride)
+                {
+                    rc = setError(VBOX_E_FILE_ERROR,
+                                  tr("Machine settings file '%s' already exists"),
+                                  mData->m_strConfigFileFull.raw());
+                }
                 if (RT_SUCCESS(vrc))
                     RTFileClose(f);