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

Merge branch 'pr1730'

Browse Source
This commit is contained in:
tux3 2015-05-25 18:39:49 +02:00
commit df7480f59c
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/core.cpp
View File

@ -763,7 +763,7 @@ void Core::setAvatar(const QByteArray& data)
pic.loadFromData(data);
Settings::getInstance().saveAvatar(pic, getSelfId().toString());
emit selfAvatarChanged(pic);
AvatarBroadcaster::setAvatar(data);
AvatarBroadcaster::enableAutoBroadcast();
}
@ -1329,7 +1329,11 @@ void Core::setNospam(uint32_t nospam)
void Core::resetCallSources()
{
for (ToxGroupCall& call : groupCalls)
{
for (ALuint source : call.alSources)
alDeleteSources(1, &source);
call.alSources.clear();
}
for (ToxCall& call : calls)
{

2
src/core/coreav.cpp
View File

@ -629,6 +629,8 @@ void Core::leaveGroupCall(int groupId)
groupCalls[groupId].active = false;
disconnect(groupCalls[groupId].sendAudioTimer,0,0,0);
groupCalls[groupId].sendAudioTimer->stop();
for (ALuint source : groupCalls[groupId].alSources)
alDeleteSources(1, &source);
groupCalls[groupId].alSources.clear();
Audio::unsuscribeInput();
delete groupCalls[groupId].sendAudioTimer;