From 0819bce58c6ee4e2ee0924ba38859ea721b17652 Mon Sep 17 00:00:00 2001
From: Pierre Lespagnol <pierre.lespagnol@savoirfairelinux.com>
Date: Tue, 1 Oct 2019 17:06:26 -0400
Subject: [PATCH] conference: fix preview and peer display after conference
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ie82f2adaa1976fc33bd1c6d016d7981ab3476893
Reviewed-by: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
---
 src/media/video/video_rtp_session.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/media/video/video_rtp_session.cpp b/src/media/video/video_rtp_session.cpp
index f90723c21..c1db4f6f6 100644
--- a/src/media/video/video_rtp_session.cpp
+++ b/src/media/video/video_rtp_session.cpp
@@ -327,6 +327,11 @@ void VideoRtpSession::exitConference()
         videoMixer_.reset();
     }
 
+    // videoLocal_ is reset when a conference is created (only mixer need videoInput)
+    // when the conference is removed, we need to set videoLocal_ for the remaining call
+    if (!videoLocal_)
+        videoLocal_ = getVideoCamera();
+
     if (videoLocal_)
         videoLocal_->attach(sender_.get());