From 95d52e49971d90d19911727cecd62dca9767f384 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@teaspeak.de>
Date: Fri, 3 Apr 2020 13:50:20 +0200
Subject: [PATCH] Updating some revs

---
 git-teaspeak                          | 2 +-
 music                                 | 2 +-
 server/src/Configuration.cpp          | 2 ++
 server/src/client/web/VoiceBridge.cpp | 4 ++--
 shared                                | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/git-teaspeak b/git-teaspeak
index 59e5721..9f4f5e7 160000
--- a/git-teaspeak
+++ b/git-teaspeak
@@ -1 +1 @@
-Subproject commit 59e57218969572d50fd9f014ab5df59046b7a196
+Subproject commit 9f4f5e72a7fc35d0c9e7faf1678cd168daf90ab9
diff --git a/music b/music
index 4c7bc8e..39fa2c6 160000
--- a/music
+++ b/music
@@ -1 +1 @@
-Subproject commit 4c7bc8ef8fe8d768883b31d29677baac81a3fb90
+Subproject commit 39fa2c60737152f8c60710c541698d83d8fdcd7f
diff --git a/server/src/Configuration.cpp b/server/src/Configuration.cpp
index ebed963..968ed87 100644
--- a/server/src/Configuration.cpp
+++ b/server/src/Configuration.cpp
@@ -1352,12 +1352,14 @@ std::deque<std::shared_ptr<EntryBinding>> config::create_bindings() {
             }
 
             /* TeaSpeak */
+            /*
             {
                 CREATE_BINDING("teaspeak", FLAG_RELOADABLE);
                 BIND_BOOL(config::server::clients::teaspeak, true);
                 ADD_DESCRIPTION("Allow/disallow the TeaSpeak - Client to join the server.");
                 ADD_NOTE_RELOADABLE();
             }
+            */
             {
                 CREATE_BINDING("teaspeak_message", FLAG_RELOADABLE);
                 BIND_STRING(config::server::clients::extra_welcome_message_teaspeak, "");
diff --git a/server/src/client/web/VoiceBridge.cpp b/server/src/client/web/VoiceBridge.cpp
index 74c3fe5..16d1d97 100644
--- a/server/src/client/web/VoiceBridge.cpp
+++ b/server/src/client/web/VoiceBridge.cpp
@@ -154,12 +154,12 @@ void VoiceBridge::remote_ice_finished() {
 }
 
 std::string VoiceBridge::generate_answer() {
-    return this->connection->generate_answer(true);
+    return this->connection->generate_answer(false);
 }
 
 void VoiceBridge::execute_tick() {
     if(!this->_voice_channel) {
-        if(this->offer_timestamp.time_since_epoch().count() > 0 && this->offer_timestamp + chrono::seconds(10) < chrono::system_clock::now()) {
+        if(this->offer_timestamp.time_since_epoch().count() > 0 && this->offer_timestamp + chrono::seconds{20} < chrono::system_clock::now()) {
             this->offer_timestamp = chrono::system_clock::time_point();
             this->connection->callback_setup_fail(rtc::PeerConnection::ConnectionComponent::BASE, "setup timeout");
         }
diff --git a/shared b/shared
index 0bfcb27..fab6aa9 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 0bfcb27002c7431d36aaa913d0f64f5a8b119d2b
+Subproject commit fab6aa90954bc85efad8a0b5a3608cb408202a17