summary refs log tree commit diff
path: root/src/CallManager.cpp
diff options
context:
space:
mode:
authortrilene <trilene@runbox.com>2021-01-01 08:46:08 -0500
committerNicolas Werner <nicolas.werner@hotmail.de>2021-01-07 14:04:54 +0100
commit9bbade37dec0ba98be0e9b20f7a6f45cff59a9b0 (patch)
tree94983d962122f0cdd594d8156ed51b9fe90ebb39 /src/CallManager.cpp
parentFix Qml control colors (diff)
downloadnheko-9bbade37dec0ba98be0e9b20f7a6f45cff59a9b0.tar.xz
Fix call answered on another device
Diffstat (limited to '')
-rw-r--r--src/CallManager.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/CallManager.cpp b/src/CallManager.cpp

index 9864b203..f725d49f 100644 --- a/src/CallManager.cpp +++ b/src/CallManager.cpp
@@ -351,12 +351,15 @@ CallManager::handleEvent(const RoomEvent<CallAnswer> &callAnswerEvent) callAnswerEvent.content.call_id, callAnswerEvent.sender); - if (!isOnCall() && callAnswerEvent.sender == utils::localUser().toStdString() && + if (callAnswerEvent.sender == utils::localUser().toStdString() && callid_ == callAnswerEvent.content.call_id) { - emit ChatPage::instance()->showNotification("Call answered on another device."); - stopRingtone(); - haveCallInvite_ = false; - emit newInviteState(); + if (!isOnCall()) { + emit ChatPage::instance()->showNotification( + "Call answered on another device."); + stopRingtone(); + haveCallInvite_ = false; + emit newInviteState(); + } return; }