Changeset 42824 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 15, 2012 1:30:18 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Medium-enumeration race fix.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -177 +177 @@
     /** Constructs a regular enum event */
     VBoxMediaEnumEvent (const UIMedium &aMedium,
-                        VBoxMediaList::iterator &aIterator)
+                        const VBoxMediaList::iterator &aIterator)
         : QEvent ((QEvent::Type) MediaEnumEventType)
         , mMedium (aMedium), mIterator (aIterator), mLast (false)
         {}
     /** Constructs the last enum event */
-    VBoxMediaEnumEvent (VBoxMediaList::iterator &aIterator)
+    VBoxMediaEnumEvent (const VBoxMediaList::iterator &aIterator)
         : QEvent ((QEvent::Type) MediaEnumEventType)
         , mIterator (aIterator), mLast (true)
@@ -189 +189 @@
     /** Last enumerated medium (not valid when #last is true) */
     const UIMedium mMedium;
-    /** Opaque iterator provided by the event sender (guaranteed to be
-     *  the same variable for all media in the single enumeration procedure) */
-    VBoxMediaList::iterator &mIterator;
+    /* Iterator which points to the corresponding item in the GUI thread: */
+    const VBoxMediaList::iterator mIterator;
     /** Whether this is the last event for the given enumeration or not */
     const bool mLast;
@@ -2013 +2012 @@
                     postEvent (self,
                                new VBoxMediaEnumEvent (mVector [i], mSavedIt));
+                ++mSavedIt;
             }
 
@@ -4024 +4024 @@
                 *(ev->mIterator) = ev->mMedium;
                 emit mediumEnumerated (*ev->mIterator);
-                ++ ev->mIterator;
             }
             else