#29579: video: fix dual sink start

e2e58668 · Guillaume Roguez · 1c21b1cd · e2e58668
Commit e2e58668 authored Sep 17, 2013 by Guillaume Roguez
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

daemon/src/video/video_receive_thread.cpp daemon/src/video/video_receive_thread.cpp +7 -5

No files found.
--- a/daemon/src/video/video_receive_thread.cpp
+++ b/daemon/src/video/video_receive_thread.cpp
@@ -235,11 +235,13 @@ void VideoReceiveThread::exitConference()
    if (!isRunning())
        return;

-    EXIT_IF_FAIL(sink_.start(), "RX: sink startup failed");
-    if (attach(&sink_)) {
-        Manager::instance().getVideoControls()->startedDecoding(id_+"RX", sink_.openedName(), dstWidth_, dstHeight_);
-        DEBUG("RX: shm sink <%s> started: size = %dx%d",
-              sink_.openedName().c_str(), dstWidth_, dstHeight_);
+    if (sink_.openedName().empty()) {
+        EXIT_IF_FAIL(sink_.start(), "RX: sink startup failed");
+        if (attach(&sink_)) {
+            Manager::instance().getVideoControls()->startedDecoding(id_+"RX", sink_.openedName(), dstWidth_, dstHeight_);
+            DEBUG("RX: shm sink <%s> started: size = %dx%d",
+                  sink_.openedName().c_str(), dstWidth_, dstHeight_);
+        }
    }
 }