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

Using this->ref() and this->weak_ref() instead of direct member access

Browse Source
This commit is contained in:
WolverinDEV
2021-02-21 20:28:59 +01:00
parent e9445d6568
commit 71b2d734bd
31 changed files with 220 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/client/SpeakingClient.cpp
+5 -5
View File
@@ -117,7 +117,7 @@ command_result SpeakingClient::handleCommandClientInit(Command& cmd) {
}
TIMING_STEP(timings, "join atmp c");
if(!DatabaseHelper::assignDatabaseId(this->server->getSql(), this->server->getServerId(), _this.lock())) {
if(!DatabaseHelper::assignDatabaseId(this->server->getSql(), this->server->getServerId(), this->ref())) {
return command_result{error::vs_critical, "Could not assign database id!"};
}
@@ -380,7 +380,7 @@ command_result SpeakingClient::handleCommandClientInit(Command& cmd) {
}
this->postCommandHandler.emplace_back([&](){
auto self = dynamic_pointer_cast<SpeakingClient>(_this.lock());
auto self = dynamic_pointer_cast<SpeakingClient>(this->ref());
std::thread([self](){
if(self->state != ConnectionState::INIT_HIGH) return;
try {
@@ -411,7 +411,7 @@ void SpeakingClient::processJoin() {
}
TIMING_STEP(timings, "setup ");
ref_server->registerClient(_this.lock());
ref_server->registerClient(this->ref());
{
if(this->rtc_client_id) {
/* in case of client reconnect */
@@ -438,7 +438,7 @@ void SpeakingClient::processJoin() {
TIMING_STEP(timings, "server reg ");
ref_server->getGroupManager()->cleanupAssignments(this->getClientDatabaseId());
TIMING_STEP(timings, "grp cleanup");
ref_server->getGroupManager()->update_server_group_property(_this.lock(), true, nullptr);
ref_server->getGroupManager()->update_server_group_property(this->ref(), true, nullptr);
TIMING_STEP(timings, "grp apply ");
this->properties()[property::CLIENT_COUNTRY] = config::geo::countryFlag;
@@ -537,7 +537,7 @@ void SpeakingClient::processJoin() {
}
void SpeakingClient::processLeave() {
auto ownLock = _this.lock();
auto ownLock = this->ref();
auto server = this->getServer();
auto channel = this->currentChannel;