From 0c7a747663edaf5c5cdfba7b2063570a3746b0c8 Mon Sep 17 00:00:00 2001
From: Michael Goddard <michael.goddard@nokia.com>
Date: Thu, 24 Nov 2011 12:42:24 +1000
Subject: If we fail to connect to pulse, don't enumerate sinks or sources.

Otherwise the pulse client library dislikes having methods called
with a null context.

Change-Id: I96629065b7a0e36e0d10402526cb167e65458e27
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
---
 src/plugins/pulseaudio/qpulseaudioengine.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/pulseaudio/qpulseaudioengine.cpp b/src/plugins/pulseaudio/qpulseaudioengine.cpp
index 06afa5bb3..ead4b3b66 100644
--- a/src/plugins/pulseaudio/qpulseaudioengine.cpp
+++ b/src/plugins/pulseaudio/qpulseaudioengine.cpp
@@ -264,9 +264,11 @@ QPulseAudioEngine::QPulseAudioEngine(QObject *parent)
 
     pa_threaded_mainloop_unlock(m_mainLoop);
 
-    serverInfo();
-    sinks();
-    sources();
+    if (ok) {
+        serverInfo();
+        sinks();
+        sources();
+    }
 }
 
 QPulseAudioEngine::~QPulseAudioEngine()
-- 
cgit v1.2.3