Commit d8ca7c55 authored by Andreas Traczyk's avatar Andreas Traczyk Committed by Ming Rui Zhang

callview: fix hangup not toggling fullscreen mode

- regression introduced by:
  https://review.jami.net/c/ring-client-windows/+/12790

Change-Id: Ia307c2fd6ed769dc8cd4e3d1ac8d3f8ad44d090b
parent 32e1913c
......@@ -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:
......
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment