1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr1267'

This commit is contained in:
tux3 2015-02-25 10:41:47 +01:00
commit 80c4cb8b45
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -366,9 +366,8 @@ void ChatForm::onAvCancel(int FriendId, int)
delete callConfirm;
callConfirm = nullptr;
stopCounter();
enableCallButtons();
stopCounter();
netcam->hide();
@ -386,10 +385,9 @@ void ChatForm::onAvEnd(int FriendId, int)
callConfirm = nullptr;
enableCallButtons();
stopCounter();
netcam->hide();
stopCounter();
}
void ChatForm::onAvRinging(int FriendId, int CallId, bool video)
@ -474,10 +472,9 @@ void ChatForm::onAvEnding(int FriendId, int)
callConfirm = nullptr;
enableCallButtons();
stopCounter();
netcam->hide();
stopCounter();
}
void ChatForm::onAvRequestTimeout(int FriendId, int)
@ -491,6 +488,7 @@ void ChatForm::onAvRequestTimeout(int FriendId, int)
callConfirm = nullptr;
enableCallButtons();
stopCounter();
netcam->hide();
}
@ -506,7 +504,8 @@ void ChatForm::onAvPeerTimeout(int FriendId, int)
callConfirm = nullptr;
enableCallButtons();
stopCounter();
netcam->hide();
}