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

Timestamp:

May 28, 2013 8:27:31 PM (12 years ago)

Author:

vboxsync

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

86055

Message:

Main/Machine: don't forget to create a new guest property if it does not exist yet

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -5893 +5893 @@
 
         bool fDelete = !RT_VALID_PTR(aValue) || *(aValue) == '\0';
-        HWData::GuestPropertyMap::iterator it =
-            mHWData->mGuestProperties.find(utf8Name);
-
+        HWData::GuestPropertyMap::iterator it = mHWData->mGuestProperties.find(utf8Name);
         if (it == mHWData->mGuestProperties.end())
         {
@@ -5940 +5938 @@
                 }
                 else
-                {
                     mHWData->mGuestProperties.erase(it);
-                }
             }
         }
@@ -13237 +13233 @@
          * Convert input up front.
          */
-        Utf8Str     utf8Name(aName);
-        uint32_t    fFlags = NILFLAG;
+        Utf8Str  utf8Name(aName);
+        uint32_t fFlags = NILFLAG;
         if (aFlags)
         {
@@ -13275 +13271 @@
         mHWData.backup();
 
+        bool fDelete = !RT_VALID_PTR(aValue) || *(aValue) == '\0';
         HWData::GuestPropertyMap::iterator it = mHWData->mGuestProperties.find(utf8Name);
         if (it != mHWData->mGuestProperties.end())
         {
-            if (RT_VALID_PTR(aValue) && *(aValue) != '\0')
+            if (!fDelete)
             {
                 it->second.strValue   = aValue;
@@ -13286 +13283 @@
             else
                 mHWData->mGuestProperties.erase(it);
-
+            
+            mData->mGuestPropertiesModified = TRUE;
+        }
+        else if (!fDelete)
+        {
+            HWData::GuestProperty prop;
+            prop.strValue = aValue;
+            prop.mTimestamp = aTimestamp;
+            prop.mFlags = fFlags;
+
+            mHWData->mGuestProperties[utf8Name] = prop;
             mData->mGuestPropertiesModified = TRUE;
         }