commit 62b08ac1763bd425825a29ce9a6488f0e589a9d9
author Sébastien Blin <sebastien.blin@savoirfairelinux.com> Fri Dec 14 16:18:04 2018 -0500
committer Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> Tue Dec 18 19:31:17 2018 -0500
tree db57501e619ac456b57b859c9788befa357b833e
parent 93bd20682a0f8254510fb2aac3db494575143758

callwidget: fix fullscreen behavior

Change-Id: Idb0a0b29a70b87366eb3c42caa4c6da584e535b5
Gitlab: #421
Reviewed-by: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>

callwidget.cpp

diff --git a/callwidget.cpp b/callwidget.cpp
index 456d733..f418d50 100644
--- a/callwidget.cpp
+++ b/callwidget.cpp
@@ -146,6 +146,12 @@
     connect(ui->videoWidget, &VideoView::videoSettingsClicked,
             this, &CallWidget::settingsButtonClicked);
 
+    connect(ui->videoWidget, &VideoView::toggleFullScreenClicked,
+        this, &CallWidget::slotToggleFullScreenClicked);
+
+    connect(ui->videoWidget, &VideoView::closing,
+        this, &CallWidget::slotVideoViewDestroyed);
+
     connect(ui->btnConversations, &QPushButton::clicked,
             this, &CallWidget::conversationsButtonClicked);
 
@@ -730,7 +736,10 @@
     auto currentConversationModel = LRCInstance::getCurrentConversationModel();
     auto callModel = LRCInstance::getCurrentCallModel();
     auto conversation = Utils::getConversationFromUid(convUid, *currentConversationModel);
-    if (callid != conversation->callId) return;
+    if (conversation != currentConversationModel->allFilteredConversations().end() &&
+        callid != conversation->callId) {
+        return;
+    }
     if (ui->mainActivityWidget->isFullScreen()) {
         ui->stackedWidget->addWidget(ui->mainActivityWidget);
         ui->stackedWidget->setCurrentWidget(ui->mainActivityWidget);