Revise CPulseAudioClient::finalize() to free all the resources which have been alread...

[platform/core/api/audio-io.git] / src / cpp / CPulseAudioClient.cpp

diff --git a/src/cpp/CPulseAudioClient.cpp b/src/cpp/CPulseAudioClient.cpp
index bd123bb..288a02e 100644 (file)
--- a/src/cpp/CPulseAudioClient.cpp
+++ b/src/cpp/CPulseAudioClient.cpp
@@ -446,22 +446,21 @@ void CPulseAudioClient::initialize() {
 
 void CPulseAudioClient::finalize() {
     AUDIO_IO_LOGD("");
-    if (__mIsInit == false) {
-        return;
-    }
 
-    if (isInThread() == false)
+    if (__mpMainloop && isInThread() == false)
         pa_threaded_mainloop_lock(__mpMainloop);
 
     /* clear callbacks */
-    if (__mDirection == EStreamDirection::STREAM_DIRECTION_PLAYBACK)
-        pa_stream_set_write_callback(__mpStream, NULL, NULL);
-    else
-        pa_stream_set_read_callback(__mpStream, NULL, NULL);
-    pa_stream_set_latency_update_callback(__mpStream, NULL, NULL);
-    pa_stream_set_event_callback(__mpStream, NULL, NULL);
-
-    if (isInThread() == false)
+    if (__mpStream) {
+        if (__mDirection == EStreamDirection::STREAM_DIRECTION_PLAYBACK)
+            pa_stream_set_write_callback(__mpStream, NULL, NULL);
+        else
+            pa_stream_set_read_callback(__mpStream, NULL, NULL);
+        pa_stream_set_latency_update_callback(__mpStream, NULL, NULL);
+        pa_stream_set_event_callback(__mpStream, NULL, NULL);
+    }
+
+    if (__mpMainloop && isInThread() == false)
         pa_threaded_mainloop_unlock(__mpMainloop);
 
     /* Wait for drain complete if draining before finalize */