From 4223800af726b2a0784adfbbc761c7343cb4951f Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Fri, 5 Jul 2019 12:17:28 -0700 Subject: [PATCH] BUGZ-923: Fix an edge case in Audio I/O devices in Settings -> About --- .../qml/hifi/simplifiedUI/settingsApp/about/About.qml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml index 7fa9b63dab..d562aae70d 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml @@ -25,6 +25,14 @@ Flickable { if (visible) { root.contentX = 0; root.contentY = 0; + + // When the user clicks the About tab, refresh the audio I/O model so that + // the delegate Component.onCompleted handlers fire, which will update + // the text that appears in the About screen. + audioOutputDevices.model = undefined; + audioOutputDevices.model = AudioScriptingInterface.devices.output; + audioInputDevices.model = undefined; + audioInputDevices.model = AudioScriptingInterface.devices.input; } } @@ -207,7 +215,6 @@ Flickable { Layout.preferredWidth: parent.width Layout.preferredHeight: contentItem.height interactive: false - model: AudioScriptingInterface.devices.input delegate: Item { Component.onCompleted: { if (HMD.active && selectedHMD) { @@ -241,7 +248,6 @@ Flickable { Layout.preferredWidth: parent.width Layout.preferredHeight: contentItem.height interactive: false - model: AudioScriptingInterface.devices.output delegate: Item { Component.onCompleted: { if (HMD.active && selectedHMD) {