Changeset 68663 in vbox for trunk

Timestamp:

Sep 5, 2017 6:47:43 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7820: Runtime UI: Make sure there are no traces of audio menu/indicator if audio is disabled.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIIndicatorsPool.cpp (modified) (1 diff)
• UISession.cpp (modified) (1 diff)

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

@@ -454 +454 @@
             setState(enmState);
         }
-        else
-        {
-            strFullData = QString(s_strTableRow1).arg(QApplication::translate("UIGDetails", "Disabled", "details (audio)"));
-            setState(AudioState_AllOff);
-        }
+
+        /* Hide indicator if adapter is disabled: */
+        if (!fAudioEnabled)
+            hide();
 
         /* Update tool-tip: */

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

@@ -2155 +2155 @@
     }
 
+    /* Audio stuff: */
+    {
+        /* Check whether audio controller is enabled. */
+        const CAudioAdapter &comAdapter = machine().GetAudioAdapter();
+        if (comAdapter.isNull() || !comAdapter.GetEnabled())
+            restrictionForDevices = (UIExtraDataMetaDefs::RuntimeMenuDevicesActionType)(restrictionForDevices | UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_Audio);
+    }
+
     /* Network stuff: */
     {