summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2011-11-24 12:42:24 +1000
committerQt by Nokia <qt-info@nokia.com>2011-11-24 05:06:42 +0100
commit0c7a747663edaf5c5cdfba7b2063570a3746b0c8 (patch)
tree872238c3b2bcaf4daa072a2f7d3d0d9559a46724 /src/plugins
parentd2a4f632cd70e2ee9f1b59e8884e66bfe424edb6 (diff)
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>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/pulseaudio/qpulseaudioengine.cpp8
1 files changed, 5 insertions, 3 deletions
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()