From d8ca7c5574350561c20b2ee551cef8a0622826db Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Tue, 5 Nov 2019 16:17:55 -0500
Subject: [PATCH] callview: fix hangup not toggling fullscreen mode
- regression introduced by:
https://review.jami.net/c/ring-client-windows/+/12790
Change-Id: Ia307c2fd6ed769dc8cd4e3d1ac8d3f8ad44d090b
---
callwidget.cpp | 6 ++----
callwidget.h | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/callwidget.cpp b/callwidget.cpp
index 3a794ac..b542f6b 100644
--- a/callwidget.cpp
+++ b/callwidget.cpp
@@ -195,9 +195,6 @@ CallWidget::CallWidget(QWidget* parent) :
connect(ui->videoView, &VideoView::toggleFullScreenClicked,
this, &CallWidget::slotToggleFullScreenClicked);
- connect(ui->videoView, &VideoView::terminating,
- this, &CallWidget::slotVideoViewTerminating);
-
connect(&LRCInstance::behaviorController(), &BehaviorController::showCallView,
this, &CallWidget::slotShowCallView);
@@ -826,7 +823,7 @@ CallWidget::slotToggleFullScreenClicked()
}
void
-CallWidget::slotVideoViewTerminating(const std::string& id)
+CallWidget::callTerminating(const std::string& id)
{
auto conversation = LRCInstance::getCurrentConversation();
if ( conversation.uid.empty() &&
@@ -1341,6 +1338,7 @@ CallWidget::connectAccount(const std::string& accountId)
ui->videoView->updateCall();
setCallPanelVisibility(false);
showConversationView();
+ callTerminating(callId);
break;
}
case lrc::api::call::Status::CONNECTED:
diff --git a/callwidget.h b/callwidget.h
index ae4e80f..8da3fbe 100644
--- a/callwidget.h
+++ b/callwidget.h
@@ -82,7 +82,6 @@ private slots:
void slotShowChatView(const std::string & accountId, const lrc::api::conversation::Info & convInfo);
void slotNewTrustRequest(const std::string& accountId, const std::string& contactUri);
void slotToggleFullScreenClicked();
- void slotVideoViewTerminating(const std::string& callid);
void update();
void ShowContextMenu(const QPoint& pos);
void Paste();
@@ -105,6 +104,7 @@ private slots:
void slotVideoDeviceListChanged();
private:
+ void callTerminating(const std::string& callid);
void onIncomingMessage(const std::string& accountId, const std::string& convUid,
uint64_t interactionId, const lrc::api::interaction::Info& interaction);
void conversationsButtonClicked();
--
GitLab