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

Timestamp:

Aug 17, 2009 3:55:30 PM (15 years ago)

Author:

vboxsync

Message:

Main: fix broken deletion of extradata

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (1 diff)
• VirtualBoxImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2705 +2705 @@
         }
 
-        mData->m_pMachineConfigFile->mapExtraDataItems[strKey] = strValue;
+        if (strValue.isEmpty())
+            mData->m_pMachineConfigFile->mapExtraDataItems.erase(strKey);
+        else
+            mData->m_pMachineConfigFile->mapExtraDataItems[strKey] = strValue;
                 // creates a new key if needed
 

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1561 +1561 @@
         AutoWriteLock alock(this);
 
-        m_pMainConfigFile->mapExtraDataItems[strKey] = strValue;
+        if (strValue.isEmpty())
+            m_pMainConfigFile->mapExtraDataItems.erase(strKey);
+        else
+            m_pMainConfigFile->mapExtraDataItems[strKey] = strValue;
                 // creates a new key if needed