Changeset 59887 in vbox

Timestamp:

Mar 1, 2016 2:44:33 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7127: Medium-enumeration improvements: Do not start medium-enumeration on VBoxGlobal prepare; start it on Selector UI or Runtime UI prepare if necessary.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (4 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (1 diff)

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

@@ -1746 +1746 @@
 }
 
-void VBoxGlobal::startMediumEnumeration(bool fForceStart /* = true*/)
+void VBoxGlobal::startMediumEnumeration()
 {
     /* Make sure VBoxGlobal is already valid: */
@@ -1766 +1766 @@
      * restoring or the code with have a heart attack. */
     if (shouldRestoreCurrentSnapshot())
-        return;
-
-    /* Developer doesn't want any unnecessary media caching! */
-    if (!fForceStart && !agressiveCaching())
         return;
 
@@ -4354 +4350 @@
     UIConverter::prepare();
 
-    /* Cache IMedium data.
-     * There could be no used mediums at all,
-     * but this method should be run anyway just to enumerate null UIMedium object,
-     * used by some VBox smart widgets, like VBoxMediaComboBox: */
+    /* Create medium enumerator but don't do any immediate caching. */
     m_pMediumEnumerator = new UIMediumEnumerator;
     {
@@ -4372 +4365 @@
                 this, SIGNAL(sigMediumEnumerationFinished()));
     }
-    if (agressiveCaching())
-        startMediumEnumeration();
 
     /* Create shortcut pool: */

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

@@ -350 +350 @@
 
     /* API: Medium-enumeration stuff: */
-    void startMediumEnumeration(bool fForceStart = true);
+    void startMediumEnumeration();
     bool agressiveCaching() const { return mAgressiveCaching; }
     bool isMediumEnumerationInProgress() const;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -204 +204 @@
     qApp->setQuitOnLastWindowClosed(false);
 
-    /* Cache medium data if necessary: */
-    vboxGlobal().startMediumEnumeration(false /* force start */);
+    /* Cache medium data early if necessary: */
+    if (vboxGlobal().agressiveCaching())
+        vboxGlobal().startMediumEnumeration();
 
     /* Prepare machine-logic: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -1143 +1143 @@
 #endif /* Q_WS_MAC */
 
+    /* Cache medium data early if necessary: */
+    if (vboxGlobal().agressiveCaching())
+        vboxGlobal().startMediumEnumeration();
+
     /* Prepare: */
     prepareIcon();