From 338ff1c3999a99e44734d816fbce3bcd8dd3dae3 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Thu, 18 Jul 2019 10:45:50 +0200 Subject: [PATCH] Made this more thread safty --- server/src/client/ConnectedClient.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/server/src/client/ConnectedClient.cpp b/server/src/client/ConnectedClient.cpp index 580f6ec..4685bb4 100644 --- a/server/src/client/ConnectedClient.cpp +++ b/server/src/client/ConnectedClient.cpp @@ -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; }