Changeset 79217 in vbox

Timestamp:

Jun 18, 2019 4:12:55 PM (5 years ago)

Author:

vboxsync

Message:

Main: bugref:6913: Changed the order of the IMediumRegisterEvents being generated during open existing VM

File:

• trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp (modified) (6 diffs)

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

@@ -839 +839 @@
     AutoWriteLock treeLock(i_getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
 
-    std::map<Guid, DeviceType_T> uIdsForNotify;
+    // the order of notification is critical for GUI, so use std::list<std::pair> instead of map
+    std::list<std::pair<Guid, DeviceType_T> > uIdsForNotify;
 
     HRESULT rc = S_OK;
@@ -863 +864 @@
         if (SUCCEEDED(rc))
         {
-            uIdsForNotify[pHardDisk->i_getId()] = DeviceType_HardDisk;
+            uIdsForNotify.push_back(std::pair<Guid, DeviceType_T>(pHardDisk->i_getId(), DeviceType_HardDisk));
             // Add children IDs to notification using non-recursive children enumeration.
             std::vector<std::pair<MediaList::const_iterator, ComObjPtr<Medium> > > llEnumStack;
@@ -877 +878 @@
                     continue;
                 }
-                uIdsForNotify[(*llEnumStack.back().first)->i_getId()] = DeviceType_HardDisk;
+                uIdsForNotify.push_back(std::pair<Guid, DeviceType_T>((*llEnumStack.back().first)->i_getId(), DeviceType_HardDisk));
                 const MediaList& childMediaList = (*llEnumStack.back().first)->i_getChildren();
                 if (!childMediaList.empty())
@@ -914 +915 @@
         rc = i_registerMedium(pImage, &pImage, treeLock);
         if (SUCCEEDED(rc))
-            uIdsForNotify[pImage->i_getId()] = DeviceType_DVD;
+            uIdsForNotify.push_back(std::pair<Guid, DeviceType_T>(pImage->i_getId(), DeviceType_DVD));
         // Avoid trouble with lock/refcount, before returning or not.
         treeLock.release();
@@ -941 +942 @@
         rc = i_registerMedium(pImage, &pImage, treeLock);
         if (SUCCEEDED(rc))
-            uIdsForNotify[pImage->i_getId()] = DeviceType_Floppy;
+            uIdsForNotify.push_back(std::pair<Guid, DeviceType_T>(pImage->i_getId(), DeviceType_Floppy));
         // Avoid trouble with lock/refcount, before returning or not.
         treeLock.release();
@@ -951 +952 @@
     if (SUCCEEDED(rc))
     {
-        for (std::map<com::Guid, DeviceType_T>::const_iterator itItem = uIdsForNotify.begin();
+        for (std::list<std::pair<Guid, DeviceType_T> >::const_iterator itItem = uIdsForNotify.begin();
              itItem != uIdsForNotify.end();
              ++itItem)