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

Fixed some stuff

Browse Source
This commit is contained in:
WolverinDEV 2020-04-03 19:26:22 +02:00
parent 8e4d52ddd2
commit 824aec6322
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/Configuration.h
View File

@ -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());
}
}

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

@ -381,7 +381,7 @@ bool ConnectedClient::notifyClientLeftView(
std::shared_ptr<ConnectedClient> 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) {