Changeset 80895 in vbox for trunk

Timestamp:

Sep 18, 2019 4:21:48 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8472: Let the short enumeration routine to emit start/finish signals if appropriate; Sync code between full and short enumeration routines.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp

@@ -197 +197 @@
     m_media = guiMedia;
 
-    /* Notify listener about enumeration started: */
-    LogRel(("GUI: UIMediumEnumerator: Medium-enumeration started...\n"));
-    m_fMediumEnumerationInProgress = true;
-    emit sigMediumEnumerationStarted();
-
-    /* Make sure we really have more than one UIMedium (which is NULL): */
-    if (   m_media.size() == 1
-        && m_media.first().id() == UIMedium::nullID())
-    {
-        /* Notify listener about enumeration finished instantly: */
-        LogRel(("GUI: UIMediumEnumerator: Medium-enumeration finished!\n"));
-        m_fMediumEnumerationInProgress = false;
-        emit sigMediumEnumerationFinished();
+    /* If enumeration hasn't yet started: */
+    if (!m_fMediumEnumerationInProgress)
+    {
+        /* Notify listener about enumeration started: */
+        LogRel(("GUI: UIMediumEnumerator: Medium-enumeration started...\n"));
+        m_fMediumEnumerationInProgress = true;
+        emit sigMediumEnumerationStarted();
+
+        /* Make sure we really have more than one UIMedium (which is NULL): */
+        if (   guiMedia.size() == 1
+            && guiMedia.first().id() == UIMedium::nullID())
+        {
+            /* Notify listener about enumeration finished instantly: */
+            LogRel(("GUI: UIMediumEnumerator: Medium-enumeration finished!\n"));
+            m_fMediumEnumerationInProgress = false;
+            emit sigMediumEnumerationFinished();
+        }
     }
 
     /* Start enumeration for media with non-NULL ID: */
-    foreach (const QUuid &uMediumID, m_media.keys())
+    foreach (const QUuid &uMediumID, guiMedia.keys())
         if (!uMediumID.isNull())
-            createMediumEnumerationTask(m_media[uMediumID]);
+            createMediumEnumerationTask(guiMedia[uMediumID]);
 }
 
@@ -232 +236 @@
     foreach (const QUuid &uMediumId, guiMedia.keys())
         m_media[uMediumId] = guiMedia.value(uMediumId);
+
+    /* If enumeration hasn't yet started: */
+    if (!m_fMediumEnumerationInProgress)
+    {
+        /* Notify listener about enumeration started: */
+        LogRel(("GUI: UIMediumEnumerator: Medium-enumeration started...\n"));
+        m_fMediumEnumerationInProgress = true;
+        emit sigMediumEnumerationStarted();
+
+        /* Make sure we really have more than one UIMedium (which is NULL): */
+        if (   guiMedia.size() == 1
+            && guiMedia.first().id() == UIMedium::nullID())
+        {
+            /* Notify listener about enumeration finished instantly: */
+            LogRel(("GUI: UIMediumEnumerator: Medium-enumeration finished!\n"));
+            m_fMediumEnumerationInProgress = false;
+            emit sigMediumEnumerationFinished();
+        }
+    }
 
     /* Start enumeration for media with non-NULL ID: */