1 files changed, 12 insertions, 7 deletions
diff --git a/src/model/pulsedevice.cpp b/src/model/pulsedevice.cpp
index 8bdea54..8fb8d48 100644
--- a/src/model/pulsedevice.cpp
+++ b/src/model/pulsedevice.cpp
@@ -45,15 +45,20 @@ void PulseDevice::setPAContext( pa_context *ctx, pa_threaded_mainloop *mainloop
     startMonitoring();
 }
 
-void PulseDevice::detach()
+void PulseDevice::detach( bool paAlreadyDead )
 {
-    if ( m_monitorStream && m_mainloop ) {
-        pa_threaded_mainloop_lock( m_mainloop );
-        pa_stream_set_read_callback( m_monitorStream, 0, 0 );
-        pa_stream_disconnect( m_monitorStream );
-        pa_stream_unref( m_monitorStream );
+    if ( m_monitorStream ) {
+        if ( paAlreadyDead ) {
+            pa_stream_set_read_callback( m_monitorStream, 0, 0 );
+            pa_stream_unref( m_monitorStream );
+        } else if ( m_mainloop ) {
+            pa_threaded_mainloop_lock( m_mainloop );
+            pa_stream_set_read_callback( m_monitorStream, 0, 0 );
+            pa_stream_disconnect( m_monitorStream );
+            pa_stream_unref( m_monitorStream );
+            pa_threaded_mainloop_unlock( m_mainloop );
+        }
         m_monitorStream = 0;
-        pa_threaded_mainloop_unlock( m_mainloop );
     }
     m_context  = 0;
     m_mainloop = 0;