From 9a1ff5832a814035c028b2e2f520e800d6a934e0 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Mon, 29 May 2017 13:57:35 +0200
Subject: [PATCH] feat(ui/views/App/Calls/ConferenceManager): in progress

---
 linphone-desktop/ui/modules/Linphone/Calls/Calls.js | 11 ++++++++---
 linphone-desktop/ui/views/App/Calls/CallsWindow.js  |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/linphone-desktop/ui/modules/Linphone/Calls/Calls.js b/linphone-desktop/ui/modules/Linphone/Calls/Calls.js
index 2d7327076..28b6150b3 100644
--- a/linphone-desktop/ui/modules/Linphone/Calls/Calls.js
+++ b/linphone-desktop/ui/modules/Linphone/Calls/Calls.js
@@ -144,7 +144,9 @@ function handleCountChanged (count) {
 // -----------------------------------------------------------------------------
 
 function handleCallRunning (call) {
-  setIndexWithCall(call)
+  if (!call.isInConference) {
+    setIndexWithCall(call)
+  }
 }
 
 function handleRowsAboutToBeRemoved (_, first, last) {
@@ -161,7 +163,7 @@ function handleRowsInserted (_, first, last) {
   for (var index = last; index >= first; index--) {
     var call = model.data(model.index(index, 0))
 
-    if (call.isOutgoing) {
+    if (call.isOutgoing && !call.isInConference) {
       updateSelectedCall(call)
       return
     }
@@ -169,6 +171,9 @@ function handleRowsInserted (_, first, last) {
 
   // First received call.
   if (first === 0 && model.rowCount() === 1) {
-    updateSelectedCall(model.data(model.index(0, 0)))
+    var call = model.data(model.index(0, 0))
+    if (!call.isInConference) {
+      updateSelectedCall(model.data(model.index(0, 0)))
+    }
   }
 }
diff --git a/linphone-desktop/ui/views/App/Calls/CallsWindow.js b/linphone-desktop/ui/views/App/Calls/CallsWindow.js
index ac3af0c10..fc89ea3b6 100644
--- a/linphone-desktop/ui/views/App/Calls/CallsWindow.js
+++ b/linphone-desktop/ui/views/App/Calls/CallsWindow.js
@@ -49,7 +49,7 @@ function getContent () {
 
   var status = call.status
   if (status == null) {
-    return null
+    return calls.conferenceModel.count > 0 ? conference : null
   }
 
   var CallModel = Linphone.CallModel