StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Handle toxcore failures in Core::onAvMediaChange

Browse Source 
No, I'm not above using goto for centralized error handling.
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-10-26 21:31:25 +01:00
parent eb2b7d03ad
commit 9fd8a6124e
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/coreav.cpp
View File

@ -72,10 +72,14 @@ void Core::prepareCall(int friendId, int callId, ToxAv* toxav, bool videoEnabled
void Core::onAvMediaChange(void* toxav, int32_t callId, void* core) void Core::onAvMediaChange(void* toxav, int32_t callId, void* core)
{ {
ToxAvCSettings settings; ToxAvCSettings settings;
toxav_get_peer_csettings((ToxAv*)toxav, callId, 0, &settings); int friendId;
int friendId = toxav_get_peer_id((ToxAv*)toxav, callId, 0); if (toxav_get_peer_csettings((ToxAv*)toxav, callId, 0, &settings) < 0)
goto fail;
friendId = toxav_get_peer_id((ToxAv*)toxav, callId, 0);
if (friendId < 0)
goto fail;
qWarning() << "Core: Received media change from friend "<<friendId; qDebug() << "Core: Received media change from friend "<<friendId;
if (settings.call_type == TypeAudio) if (settings.call_type == TypeAudio)
{ {
@ -91,6 +95,11 @@ void Core::onAvMediaChange(void* toxav, int32_t callId, void* core)
calls[callId].sendVideoTimer->start(); calls[callId].sendVideoTimer->start();
emit ((Core*)core)->avMediaChange(friendId, callId, true); emit ((Core*)core)->avMediaChange(friendId, callId, true);
} }
return;
fail: // Centralized error handling
qWarning() << "Core: Toxcore error while receiving media change on call "<<callId;
return;
} }
void Core::answerCall(int callId) void Core::answerCall(int callId)