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-11-28 15:42:24 +01:00
parent 5cf3b0b75c
commit 8714761afa
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtclib

@ -1 +1 @@
Subproject commit d4771462dbe5fe11fe53a19eb43f8cfeb7bd110c
Subproject commit 4cf345fc30e058d85ab0bde105f451d05bf90dd7

4
server/src/channel/ClientChannelView.cpp
View File

@ -172,7 +172,7 @@ std::deque<std::shared_ptr<ViewEntry>> ClientChannelView::insert_channels(shared
continue;
};
auto now_prv = this->find_channel(entry->previousChannelId());
debugMessage(this->getServerId(), "{}[CHANNELS] Insert channel {} ({}) after {} ({}). Original view prv: {} ({}). Original prv: {} ({})",
logTrace(this->getServerId(), "{}[CHANNELS] Insert channel {} ({}) after {} ({}). Original view prv: {} ({}). Original prv: {} ({})",
CLIENT_STR_LOG_PREFIX_(this->owner),
channel->channelId(), channel->name(),
entry->previousChannelId(), now_prv ? now_prv->channel()->name() : "",
@ -225,7 +225,7 @@ std::deque<std::shared_ptr<ViewEntry>> ClientChannelView::show_channel(std::shar
remote_previous = remote_previous->previous;
}
auto previous_channel = previous ? previous->channel() : nullptr; //weak could be may nullptr
debugMessage(this->getServerId(), "{}[CHANNELS] Insert channel {} ({}) after {} ({})",
logTrace(this->getServerId(), "{}[CHANNELS] Insert channel {} ({}) after {} ({})",
CLIENT_STR_LOG_PREFIX_(this->owner),
channel->channelId(), channel->name(),
previous ? previous->channelId() : 0, previous_channel ? previous_channel->name() : ""

2
server/src/client/web/WebClient.cpp
View File

@ -535,7 +535,7 @@ command_result WebClient::handleCommandWhisperSessionInitialize(Command &command
return command_result{error::server_unbound};
}
auto stream_id = command["stream_id"].as<uint32_t>();
auto stream_id = command["ssrc"].as<uint32_t>();
if(command.hasParm("new")) {
auto type = command["type"].as<uint8_t>();
auto target = command["target"].as<uint8_t>();