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

Fixed music crash

Browse Source
This commit is contained in:
WolverinDEV 2020-01-30 13:37:14 +01:00
parent 7c1e6d9364
commit 80a36e7c39
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -63,6 +63,8 @@ find_package(spdlog REQUIRED)
find_package(Jemalloc REQUIRED) find_package(Jemalloc REQUIRED)
find_package(Protobuf REQUIRED) find_package(Protobuf REQUIRED)
include_directories(${StringVariable_INCLUDE_DIR})
add_subdirectory(music/)
# LibEvent fucks up the CMAKE_FIND_LIBRARY_SUFFIXES variable # LibEvent fucks up the CMAKE_FIND_LIBRARY_SUFFIXES variable
macro(find_event static) macro(find_event static)
@ -88,7 +90,6 @@ include_directories(${LIBEVENT_INCLUDE_DIRS})
include_directories(${StringVariable_INCLUDE_DIR}) include_directories(${StringVariable_INCLUDE_DIR})
add_definitions(-DINET -DINET6) add_definitions(-DINET -DINET6)
add_subdirectory(music/)
add_subdirectory(shared/) add_subdirectory(shared/)
add_subdirectory(server/) add_subdirectory(server/)
add_subdirectory(license/) add_subdirectory(license/)

2
music

@ -1 +1 @@
Subproject commit a5df20561ec66c6b8f80c96c4fadf03152959059 Subproject commit 77ebfe653cc5565d59e927cf7a542a5737e8fdf4

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

@ -830,7 +830,7 @@ command_result ConnectedClient::handleCommandBanClient(Command &cmd) {
return command_result{error::client_unknown}; return command_result{error::client_unknown};
} }
if(!permission::v2::permission_granted(this->server->calculate_permission(permission::i_client_needed_ban_power, target_dbid, ClientType::CLIENT_TEAMSPEAK, 0)), this->calculate_permission(permission::i_client_ban_power, 0)) if(!permission::v2::permission_granted(this->server->calculate_permission(permission::i_client_needed_ban_power, target_dbid, ClientType::CLIENT_TEAMSPEAK, 0), this->calculate_permission(permission::i_client_ban_power, 0)))
return command_result{permission::i_client_ban_power}; return command_result{permission::i_client_ban_power};
if (permission::v2::permission_granted(1, this->server->calculate_permission(permission::b_client_ignore_bans, target_dbid, ClientType::CLIENT_TEAMSPEAK, 0))) if (permission::v2::permission_granted(1, this->server->calculate_permission(permission::b_client_ignore_bans, target_dbid, ClientType::CLIENT_TEAMSPEAK, 0)))