Changeset 27874 in vbox

Timestamp:

Mar 31, 2010 10:08:31 AM (15 years ago)

Author:

vboxsync

Message:

Main/Machine: make the config file existence check override actually work. the settings code is very paranoid about doing the right job, so there must not be an existing config file when a new one is written the first time.

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -354 +354 @@
                )
             {
+                if (RT_SUCCESS(vrc))
+                    RTFileClose(f);
                 if (!aOverride)
                 {
@@ -360 +362 @@
                                   mData->m_strConfigFileFull.raw());
                 }
-                if (RT_SUCCESS(vrc))
-                    RTFileClose(f);
+                else
+                {
+                    /* try to delete the config file, as otherwise the creation
+                     * of a new settings file will fail. */
+                    int vrc2 = RTFileDelete(mData->m_strConfigFileFull.c_str());
+                    if (RT_FAILURE(vrc2))
+                        rc = setError(VBOX_E_FILE_ERROR,
+                                      tr("Could not delete the settings file '%s' (%Rrc)"),
+                                      mData->m_strConfigFileFull.raw(), vrc2);
+                }
             }
             else
@@ -7102 +7112 @@
  *
  *  @note Must be never called directly but only from #saveSettings().
- *
- *  @param aRenamed receives |true| if the name was changed and the settings
- *                  file was renamed as a result, or |false| otherwise. The
- *                  value makes sense only on success.
- *  @param aNew     receives |true| if a virgin settings file was created.
  */
 HRESULT Machine::prepareSaveSettings(bool *pfNeedsGlobalSaveSettings)