Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2016-05-15 19:32:04 +0300
committerMikkel Krautz <mikkel@krautz.dk>2016-06-24 01:03:12 +0300
commitcf6a5b708861cd04d06f46cfd02aea298e795d9f (patch)
treef4ac249301139e0efe19b605dfd71c6e93e3f845 /src/murmur/RPC.cpp
parentc8bd94195a9f869a82c7b53569dcd119e982df04 (diff)
Hold write lock on qrwlVoiceThread when writing to bDeaf, bMute and bSuppress.
Diffstat (limited to 'src/murmur/RPC.cpp')
-rw-r--r--src/murmur/RPC.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/murmur/RPC.cpp b/src/murmur/RPC.cpp
index 962310e6d..c34e616df 100644
--- a/src/murmur/RPC.cpp
+++ b/src/murmur/RPC.cpp
@@ -53,9 +53,13 @@ void Server::setUserState(User *pUser, Channel *cChannel, bool mute, bool deaf,
mpus.set_name(u8(name));
}
- pUser->bDeaf = deaf;
- pUser->bMute = mute;
- pUser->bSuppress = suppressed;
+ {
+ QWriteLocker wl(&qrwlVoiceThread);
+ pUser->bDeaf = deaf;
+ pUser->bMute = mute;
+ pUser->bSuppress = suppressed;
+ }
+
pUser->bPrioritySpeaker = prioritySpeaker;
pUser->qsName = name;
hashAssign(pUser->qsComment, pUser->qbaCommentHash, comment);