From 824aec6322518a2eabcb61545ec659a6615fc3e8 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Fri, 3 Apr 2020 19:26:22 +0200 Subject: [PATCH] Fixed some stuff --- server/src/Configuration.h | 3 +-- server/src/client/ConnectedClient.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server/src/Configuration.h b/server/src/Configuration.h index e729d5e..b117541 100644 --- a/server/src/Configuration.h +++ b/server/src/Configuration.h @@ -113,8 +113,7 @@ namespace ts::config { __attribute__((always_inline)) inline std::string default_version() { return strobf("TeaSpeak ").string() + build::version()->string(true); } __attribute__((always_inline)) inline bool check_server_version_with_license() { - auto currentVersion = config::server::default_version(); - return currentVersion == DefaultServerVersion || (license->isPremium() && license->isValid()); + return default_version() == DefaultServerVersion || (license->isPremium() && license->isValid()); } } diff --git a/server/src/client/ConnectedClient.cpp b/server/src/client/ConnectedClient.cpp index 1feb1fc..70af7fd 100644 --- a/server/src/client/ConnectedClient.cpp +++ b/server/src/client/ConnectedClient.cpp @@ -381,7 +381,7 @@ bool ConnectedClient::notifyClientLeftView( std::shared_ptr invoker, bool lock_channel_tree) { assert(!lock_channel_tree); /* not supported yet! */ - assert(client && client != this && client->getClientId() != 0); + assert(client == this || (client && client->getClientId() != 0)); assert(client->currentChannel || &*client == this); if(client != this) {