diff --git a/git-teaspeak b/git-teaspeak index 1a18e58..ed56014 160000 --- a/git-teaspeak +++ b/git-teaspeak @@ -1 +1 @@ -Subproject commit 1a18e5809c467954c9d46783269387e492312851 +Subproject commit ed56014317adc8a30b5a1df15c5a6fc177b76302 diff --git a/server/src/client/web/VoiceBridge.cpp b/server/src/client/web/VoiceBridge.cpp index 8a1623a..4e4b587 100644 --- a/server/src/client/web/VoiceBridge.cpp +++ b/server/src/client/web/VoiceBridge.cpp @@ -88,7 +88,7 @@ VoiceBridge::VoiceBridge(const shared_ptr& owner) : _owner(owner) { config->logger->callback_argument = this; //config->sctp.local_port = 5202; //Fire Fox don't support a different port :D - this->connection = make_unique(config); + this->connection = make_unique(config) ; } VoiceBridge::~VoiceBridge() { diff --git a/server/src/manager/SqlDataManager.cpp b/server/src/manager/SqlDataManager.cpp index e74c50b..6236000 100644 --- a/server/src/manager/SqlDataManager.cpp +++ b/server/src/manager/SqlDataManager.cpp @@ -44,7 +44,7 @@ if(!result && result.msg().find(ignore) == string::npos){ #define RESIZE_COLUMN(tblName, rowName, size) up vote EXECUTE("Could not change column size", "ALTER TABLE " tblName " ALTER COLUMN " rowName " varchar(" size ")"); -#define CURRENT_DATABASE_VERSION 12 +#define CURRENT_DATABASE_VERSION 11 #define CURRENT_PERMISSION_VERSION 3 #define CLIENT_UID_LENGTH "64" @@ -412,6 +412,7 @@ ROLLBACK; CREATE_INDEX2R("conversation_blocks", "server_id", "conversation_id"); db_version(11); +#if 0 /* not yet needed */ case 11: /* update the group table */ { @@ -475,6 +476,7 @@ ROLLBACK; CREATE_INDEX2R("clients", "serverId", "cldbid"); } db_version(12); +#endif default: break; }