From b74d10c45c3ff21c2d87871aebf0869d45b0f555 Mon Sep 17 00:00:00 2001
From: Kurt Korbatits <kurt.korbatits@nokia.com>
Date: Tue, 8 Sep 2009 14:10:56 +1000
Subject: QAudioDeviceInfo::deviceList() wasn't working correctly if no audio
 device. The default was being added even when no audio devices were
 available. Change so that the default device is only added if there is at
 least one audio device.

Reviewed-by:Bill King
---
 src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
index d8d974f..5de5c27 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
@@ -341,8 +341,6 @@ QList<QByteArray> QAudioDeviceInfoPrivate::deviceList(QAudio::Mode mode)
 
     QList<QByteArray> devices;
 
-    devices.append("default");
-
     if(mode == QAudio::AudioOutput) {
         WAVEOUTCAPS woc;
 	unsigned long iNumDevs,i;
@@ -365,6 +363,9 @@ QList<QByteArray> QAudioDeviceInfoPrivate::deviceList(QAudio::Mode mode)
 	}
 
     }
+    if(devices.count() > 0)
+        devices.append("default");
+
     return devices;
 }
 
-- 
cgit v0.12