procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix call discard when hanging up before request.

This commit is contained in:
John Preston 2017-05-05 19:27:05 +03:00
parent 622fbdb64b
commit b3d5ac1660
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Telegram/SourceFiles/calls/calls_call.cpp
View File

@ -136,18 +136,19 @@ void Call::startOutgoing() {
return; return;
} }
auto &phoneCall = call.vphone_call;
auto &waitingCall = phoneCall.c_phoneCallWaiting();
_id = waitingCall.vid.v;
_accessHash = waitingCall.vaccess_hash.v;
setState(State::Waiting); setState(State::Waiting);
if (_finishAfterRequestingCall) { if (_finishAfterRequestingCall) {
hangup(); hangup();
return; return;
} }
_discardByTimeoutTimer.callOnce(Global::CallReceiveTimeoutMs());
auto &phoneCall = call.vphone_call.c_phoneCallWaiting(); _discardByTimeoutTimer.callOnce(Global::CallReceiveTimeoutMs());
_id = phoneCall.vid.v; handleUpdate(phoneCall);
_accessHash = phoneCall.vaccess_hash.v;
handleUpdate(call.vphone_call);
}).fail([this](const RPCError &error) { }).fail([this](const RPCError &error) {
handleRequestError(error); handleRequestError(error);
}).send(); }).send();

8
Telegram/SourceFiles/calls/calls_top_bar.cpp
View File

@ -87,7 +87,9 @@ TopBar::TopBar(QWidget *parent, const base::weak_unique_ptr<Call> &call) : TWidg
void TopBar::initControls() { void TopBar::initControls() {
_mute->setClickedCallback([this] { _mute->setClickedCallback([this] {
_call->setMute(!_call->isMute()); if (auto call = _call.get()) {
call->setMute(!call->isMute());
}
}); });
setMuted(_call->isMute()); setMuted(_call->isMute());
subscribe(_call->muteChanged(), [this](bool mute) { subscribe(_call->muteChanged(), [this](bool mute) {
@ -104,8 +106,8 @@ void TopBar::initControls() {
} }
}); });
_hangup->setClickedCallback([this] { _hangup->setClickedCallback([this] {
if (_call) { if (auto call = _call.get()) {
_call->hangup(); call->hangup();
} }
}); });
_updateDurationTimer.setCallback([this] { updateDurationText(); }); _updateDurationTimer.setCallback([this] { updateDurationText(); });