Changeset 67754 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 3, 2017 12:51:55 PM (8 years ago)

Author:

vboxsync

Message:

SystemProperties::i_getDefaultAdditionsISO: fixed my locking mess from a few days back.

File:

• trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp (modified) (2 diffs)

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

@@ -1141 +1141 @@
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    if (m->strDefaultAdditionsISO.isEmpty())
+    if (m->strDefaultAdditionsISO.isNotEmpty())
+        aDefaultAdditionsISO = m->strDefaultAdditionsISO;
+    else
     {
         /* no guest additions, check if it showed up in the mean time */
@@ -1151 +1153 @@
             (void)setDefaultAdditionsISO("");
         }
-        alock.acquire();
-    }
-    aDefaultAdditionsISO = m->strDefaultAdditionsISO;
+        aDefaultAdditionsISO = m->strDefaultAdditionsISO;
+    }
     return S_OK;
 }