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

Some minor changes

Browse Source
This commit is contained in:
WolverinDEV 2020-12-04 12:23:12 +01:00
parent c21838d4f6
commit 4c7a70bc81
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/src/client/command_handler/client.cpp
View File

@ -272,13 +272,19 @@ command_result ConnectedClient::handleCommandClientMove(Command &cmd) {
} }
for(const auto& oldChannel : channels) { for(const auto& oldChannel : channels) {
if(!server_channel_w_lock.owns_lock()) if(!server_channel_w_lock.owns_lock()) {
server_channel_w_lock.lock(); server_channel_w_lock.lock();
if(oldChannel->channelType() == ChannelType::temporary && oldChannel->properties()[property::CHANNEL_DELETE_DELAY].as<int64_t>() == 0) }
if(this->server->getClientsByChannelRoot(oldChannel, false).empty())
if(oldChannel->channelType() == ChannelType::temporary && oldChannel->properties()[property::CHANNEL_DELETE_DELAY].as<int64_t>() == 0) {
if(this->server->getClientsByChannelRoot(oldChannel, false).empty()) {
this->server->delete_channel(dynamic_pointer_cast<ServerChannel>(oldChannel), this->ref(), "temporary auto delete", server_channel_w_lock, true); this->server->delete_channel(dynamic_pointer_cast<ServerChannel>(oldChannel), this->ref(), "temporary auto delete", server_channel_w_lock, true);
if(server_channel_w_lock.owns_lock()) }
}
if(server_channel_w_lock.owns_lock()) {
server_channel_w_lock.unlock(); server_channel_w_lock.unlock();
}
} }
return command_result{std::forward<command_result_bulk>(result)}; return command_result{std::forward<command_result_bulk>(result)};
} }
@ -700,11 +706,14 @@ command_result ConnectedClient::handleCommandClientEdit(Command &cmd, const std:
new_value new_value
); );
} }
if(update_talk_rights) if(update_talk_rights) {
client->updateTalkRights(client->calculate_permission(permission::i_client_talk_power, client->getChannelId())); client->updateTalkRights(client->calculate_permission(permission::i_client_talk_power, client->getChannelId()));
}
if(this->server) if(this->server) {
this->server->notifyClientPropertyUpdates(client, updates); this->server->notifyClientPropertyUpdates(client, updates);
}
nickname_lock.reset(); nickname_lock.reset();
return command_result{error::ok}; return command_result{error::ok};
} }