Changeset 46303 in vbox for trunk/src/VBox

Timestamp:

May 29, 2013 8:24:40 AM (12 years ago)

Author:

vboxsync

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

86057

Message:

Main/Machine: always update the property flags in Machine::setGuestPropertyToService()

File:

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

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

@@ -5783 +5783 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
     Utf8Str strName(aName);
-    HWData::GuestPropertyMap::const_iterator it =
-        mHWData->mGuestProperties.find(strName);
+    HWData::GuestPropertyMap::const_iterator it = mHWData->mGuestProperties.find(strName);
 
     if (it != mHWData->mGuestProperties.end())
@@ -5875 +5874 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
     HRESULT rc = S_OK;
-    HWData::GuestProperty property;
-    property.mFlags = NILFLAG;
 
     rc = checkStateDependency(MutableStateDep);
@@ -5896 +5893 @@
         if (it == mHWData->mGuestProperties.end())
         {
-            /* only create the new property if this is really desired */
             if (!fDelete)
             {
@@ -5904 +5900 @@
                 RTTIMESPEC time;
                 HWData::GuestProperty prop;
-                prop.strValue = aValue;
+                prop.strValue   = aValue;
                 prop.mTimestamp = RTTimeSpecGetNano(RTTimeNow(&time));
-                prop.mFlags = fFlags;
-
+                prop.mFlags     = fFlags;
                 mHWData->mGuestProperties[Utf8Str(aName)] = prop;
             }
@@ -5932 +5927 @@
                 {
                     RTTIMESPEC time;
-                    it->second.strValue = aValue;
+                    it->second.strValue   = aValue;
                     it->second.mTimestamp = RTTimeSpecGetNano(RTTimeNow(&time));
-                    if (aFlags != NULL)
-                        it->second.mFlags = fFlags;
+                    it->second.mFlags     = fFlags;
                 }
                 else
@@ -13278 +13272 @@
             {
                 it->second.strValue   = aValue;
+                it->second.mTimestamp = aTimestamp;
                 it->second.mFlags     = fFlags;
-                it->second.mTimestamp = aTimestamp;
             }
             else
                 mHWData->mGuestProperties.erase(it);
-            
+
             mData->mGuestPropertiesModified = TRUE;
         }
@@ -13289 +13283 @@
         {
             HWData::GuestProperty prop;
-            prop.strValue = aValue;
+            prop.strValue   = aValue;
             prop.mTimestamp = aTimestamp;
-            prop.mFlags = fFlags;
+            prop.mFlags     = fFlags;
 
             mHWData->mGuestProperties[utf8Name] = prop;