summary refs log tree commit diff
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2021-01-10 18:46:57 +0100
committerGitHub <noreply@github.com>2021-01-10 18:46:57 +0100
commitfcedfac59785a0a57990d1bd9d82b2f2aa258d1a (patch)
treebbeb5362c725f1d4900b0c80f0ac1d8931ffee6c
parentFix some nulls in relations (diff)
parentFix call invite declined on another device (diff)
downloadnheko-fcedfac59785a0a57990d1bd9d82b2f2aa258d1a.tar.xz
Merge pull request #369 from trilene/master
Fix call invite declined on another device
-rw-r--r--src/timeline/TimelineModel.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp

index 2b5b5794..852f584d 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp
@@ -614,7 +614,9 @@ TimelineModel::addEvents(const mtx::responses::Timeline &timeline) [this](auto &event) { event.room_id = room_id_.toStdString(); if constexpr (std::is_same_v<std::decay_t<decltype(event)>, - RoomEvent<msg::CallAnswer>>) + RoomEvent<msg::CallAnswer>> || + std::is_same_v<std::decay_t<decltype(event)>, + RoomEvent<msg::CallHangUp>>) emit newCallEvent(event); else { if (event.sender != http::client()->user_id().to_string())