Changeset 14372 in vbox for trunk/src/VBox

Timestamp:

Nov 19, 2008 6:51:46 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: Slight media-enumeration mechanism fix.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxGlobal.h

@@ -960 +960 @@
     QThread *mMediaEnumThread;
     VBoxMediaList mMediaList;
-    VBoxMediaList::iterator mCurrentMediumIterator;
 
     VBoxDefs::RenderMode vm_render_mode;

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp

@@ -607 +607 @@
 
     /** Constructs a regular enum event */
-    VBoxMediaEnumEvent (const VBoxMedium &aMedium)
+    VBoxMediaEnumEvent (const VBoxMedium &aMedium,
+                        VBoxMediaList::const_iterator &aIterator)
         : QEvent ((QEvent::Type) VBoxDefs::MediaEnumEventType)
-        , mMedium (aMedium), mLast (false)
+        , mMedium (aMedium), mIterator (aIterator), mLast (false)
         {}
     /** Constructs the last enum event */
@@ -617 +618 @@
         {}
 
+    /** The last enumerated medium iterator (invalid when #last is true) */
+    VBoxMediaList::const_iterator mIterator;
     /** The last enumerated medium (not valid when #last is true) */
     const VBoxMedium mMedium;
@@ -2833 +2836 @@
         }
     }
-    mCurrentMediumIterator = mMediaList.begin();
 
     /* enumeration thread class */
@@ -2851 +2853 @@
 
             /* Enumerate the list */
-            int index = 0;
-            VBoxMediaList::const_iterator it;
-            for (it = mList.begin();
-                 it != mList.end() && !sVBoxGlobalInCleanup;
-                 ++ it, ++ index)
+            for (VBoxMediaList::const_iterator it = mList.begin();
+                 it != mList.end() && !sVBoxGlobalInCleanup; ++ it)
             {
                 VBoxMedium medium = *it;
                 medium.blockAndQueryState();
-                QApplication::postEvent (self, new VBoxMediaEnumEvent (medium));
+                QApplication::postEvent (self, new VBoxMediaEnumEvent (medium, it));
             }
 
@@ -4950 +4949 @@
                     !ev->mMedium.result().isOk())
                     vboxProblem().cannotGetMediaAccessibility (ev->mMedium);
-                Assert (mCurrentMediumIterator != mMediaList.end());
-                *mCurrentMediumIterator = ev->mMedium;
-                emit mediumEnumerated (*mCurrentMediumIterator);
-                ++ mCurrentMediumIterator;
+                Assert (ev->mIterator != mMediaList.end());
+                VBoxMedium *medium = unconst (&*ev->mIterator);
+                *medium = ev->mMedium;
+                emit mediumEnumerated (*medium);
             }
             else
@@ -4961 +4960 @@
                 delete mMediaEnumThread;
                 mMediaEnumThread = 0;
-                Assert (mCurrentMediumIterator == mMediaList.end());
                 emit mediumEnumFinished (mMediaList);
             }
@@ -5330 +5328 @@
     /* media list contains a lot of CUUnknown, release them */
     mMediaList.clear();
-    mCurrentMediumIterator = mMediaList.end();
     /* the last step to ensure we don't use COM any more */
     mVBox.detach();