Browse Source

fix(groupaudio): avoid deadlock when ending groupcall

The offending statement caused a deadlock, because the audioLock was
locked twice by the audio thread.
pull/3188/head
sudden6 10 years ago
parent
commit
afcd146a5b
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
  1. 3
      src/core/coreav.cpp

3
src/core/coreav.cpp

@ -440,10 +440,9 @@ bool CoreAV::sendGroupCallAudio(int groupId, const int16_t *pcm, size_t samples, @@ -440,10 +440,9 @@ bool CoreAV::sendGroupCallAudio(int groupId, const int16_t *pcm, size_t samples,
ToxGroupCall& call = groupCalls[groupId];
if (call.inactive || call.muteMic || !Audio::getInstance().isInputReady())
if (call.inactive || call.muteMic)
return true;
if (toxav_group_send_audio(toxav_get_tox(toxav), groupId, pcm, samples, chans, rate) != 0)
qDebug() << "toxav_group_send_audio error";

Loading…
Cancel
Save