From 3c0c48c00c0b3300da25897cdafc443695fdb687 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@did.science>
Date: Sun, 3 Jan 2021 17:20:43 +0100
Subject: [PATCH] Some minor compile fixes
---
file/local_server/LocalFileProvider.cpp | 2 +-
git-teaspeak | 2 +-
server/src/FileServerHandler.cpp | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/file/local_server/LocalFileProvider.cpp b/file/local_server/LocalFileProvider.cpp
index 456c914..d9d1920 100644
--- a/file/local_server/LocalFileProvider.cpp
+++ b/file/local_server/LocalFileProvider.cpp
@@ -60,7 +60,7 @@ bool file::initialize(std::string &error, const std::string& hostnames, uint16_t
}
}
- return true;
+ return any_bind;
}
void file::finalize() {
diff --git a/git-teaspeak b/git-teaspeak
index 5c2ff84..b07d170 160000
--- a/git-teaspeak
+++ b/git-teaspeak
@@ -1 +1 @@
-Subproject commit 5c2ff84e47d4fa905f9b01b1d6bdf783c6fdd808
+Subproject commit b07d170e7b5260d341db2617187e0df7edc71b3c
diff --git a/server/src/FileServerHandler.cpp b/server/src/FileServerHandler.cpp
index 53ef8da..9467003 100644
--- a/server/src/FileServerHandler.cpp
+++ b/server/src/FileServerHandler.cpp
@@ -14,8 +14,9 @@ using namespace ts::server::file;
FileServerHandler::FileServerHandler(ts::server::InstanceHandler *instance) : instance_{instance} {}
bool FileServerHandler::initialize(std::string &error) {
- if(!file::initialize(error, serverInstance->properties()[property::SERVERINSTANCE_FILETRANSFER_HOST].as<std::string>(), serverInstance->properties()[property::SERVERINSTANCE_FILETRANSFER_PORT].as<uint16_t>()))
+ if(!file::initialize(error, serverInstance->properties()[property::SERVERINSTANCE_FILETRANSFER_HOST].as<std::string>(), serverInstance->properties()[property::SERVERINSTANCE_FILETRANSFER_PORT].as<uint16_t>())) {
return false;
+ }
file::config::ssl_option_supplier = [&]{