TeaSpeak/Teaspeak-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made this more thread safty

Browse Source
This commit is contained in:
WolverinDEV 2019-07-18 10:45:50 +02:00
parent 2177e51380
commit 338ff1c399
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/client/ConnectedClient.cpp
View File

@ -130,15 +130,16 @@ void ConnectedClient::updateChannelClientProperties(bool lock_channel_tree, bool
}
IconId iconId = 0;
if(this->clientPermissions) {
auto local_permissions = this->clientPermissions;
if(local_permissions) {
permission::v2::PermissionFlaggedValue value{0, false};
auto permission_flags = this->clientPermissions->permission_flags(permission::i_icon_id);
auto permission_flags = local_permissions->permission_flags(permission::i_icon_id);
if(permission_flags.channel_specific && this->currentChannel) {
auto val = this->clientPermissions->channel_permission(permission::i_icon_id, this->currentChannel->channelId());
auto val = local_permissions->channel_permission(permission::i_icon_id, this->currentChannel->channelId());
value = {val.values.value, val.flags.value_set};
}
if(!value.has_value)
value = this->clientPermissions->permission_value_flagged(permission::i_icon_id);
value = local_permissions->permission_value_flagged(permission::i_icon_id);
if(value.has_value)
iconId = value.value;
}