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

Fixed some basic stuff

Browse Source
This commit is contained in:
WolverinDEV 2020-07-23 20:28:43 +02:00
parent 94453894e9
commit 9f24a71aed
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
file/include/files/FileServer.h
View File

@ -172,7 +172,7 @@ namespace ts::server::file {
} }
namespace transfer { namespace transfer {
typedef uint32_t transfer_id; typedef uint16_t transfer_id;
struct Transfer { struct Transfer {
transfer_id server_transfer_id{0}; transfer_id server_transfer_id{0};

4
server/src/client/command_handler/misc.cpp
View File

@ -2533,7 +2533,7 @@ command_result ConnectedClient::handleCommandConversationHistory(ts::Command &co
auto conversation_id = command[0]["cid"].as<ChannelId>(); auto conversation_id = command[0]["cid"].as<ChannelId>();
/* test if we have access to the conversation */ /* test if we have access to the conversation */
{ if(conversation_id > 0) {
/* test if we're able to see the channel */ /* test if we're able to see the channel */
{ {
shared_lock channel_view_lock(this->channel_lock); shared_lock channel_view_lock(this->channel_lock);
@ -2650,7 +2650,7 @@ command_result ConnectedClient::handleCommandConversationFetch(ts::Command &cmd)
result_bulk["cid"] = conversation_id; result_bulk["cid"] = conversation_id;
/* test if we have access to the conversation */ /* test if we have access to the conversation */
{ if(conversation_id > 0) {
/* test if we're able to see the channel */ /* test if we're able to see the channel */
{ {
shared_lock channel_view_lock(this->channel_lock); shared_lock channel_view_lock(this->channel_lock);

2
shared

@ -1 +1 @@
Subproject commit 7a3854843fac3416a75d71f032c7a012d9ea1107 Subproject commit a4d7c90945525aad35c1280ebfd0d0d8cc7cd197