diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2016-05-15 19:27:53 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2016-06-24 01:03:12 +0300 |
| commit | 80c6e311e2ef32f1ca5f2bb3ffde000bb9c9c243 (patch) | |
| tree | ae05b276f0f871cf685b48d6a6ae39e15a91e309 /src/murmur/Messages.cpp | |
| parent | 9dfca42ab9594f39a673fc96ca0e7c159ab4ac7c (diff) | |
Writing to User->sState requires holding qrwlVoiceThread.
Diffstat (limited to 'src/murmur/Messages.cpp')
| -rw-r--r-- | src/murmur/Messages.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/murmur/Messages.cpp b/src/murmur/Messages.cpp index 2d502401e..e25f8d07d 100644 --- a/src/murmur/Messages.cpp +++ b/src/murmur/Messages.cpp @@ -279,7 +279,11 @@ void Server::msgAuthenticate(ServerUser *uSource, MumbleProto::Authenticate &msg userEnterChannel(uSource, lc, mpus); - uSource->sState = ServerUser::Authenticated; + { + QWriteLocker wl(&qrwlVoiceThread); + uSource->sState = ServerUser::Authenticated; + } + mpus.set_session(uSource->uiSession); mpus.set_name(u8(uSource->qsName)); if (uSource->iId >= 0) { |