diff --git a/callwidget.cpp b/callwidget.cpp index 3a794ac65d200c016f5e9789631915af61daa29c..b542f6bf97417a808d2956c501ba75beeb14ca29 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 ae4e80f6e0eba0c7e2e500f2a614b727f14e2504..8da3fbe0a8d1d2ca49baf568c4abe357fde1485a 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();