From c8438c5867af0e5dcdc584ab9a99b4a1b05cee14 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Mon, 1 Mar 2021 14:50:57 +0100 Subject: [PATCH] Fixed some compile errors --- git-teaspeak | 2 +- server/src/InstanceHandler.cpp | 8 ++++++-- shared | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/git-teaspeak b/git-teaspeak index 8d025ec..fc3f3d1 160000 --- a/git-teaspeak +++ b/git-teaspeak @@ -1 +1 @@ -Subproject commit 8d025ece01e81d23f965c0284e38b6743bbc6b5a +Subproject commit fc3f3d12eba8f10b6cee4b015793e7161866eb64 diff --git a/server/src/InstanceHandler.cpp b/server/src/InstanceHandler.cpp index 112e34f..3930d2b 100644 --- a/server/src/InstanceHandler.cpp +++ b/server/src/InstanceHandler.cpp @@ -196,8 +196,12 @@ InstanceHandler::InstanceHandler(SqlDataManager *sql) : sql(sql) { this->save_channel_permissions(); } } - if(!this->default_tree->getDefaultChannel()) this->default_tree->setDefaultChannel(this->default_tree->findChannel("[cspacer04]Default Channel", nullptr)); - if(!this->default_tree->getDefaultChannel()) this->default_tree->setDefaultChannel(*this->default_tree->channels().begin()); + if(!this->default_tree->getDefaultChannel()) { + this->default_tree->setDefaultChannel(this->default_tree->findChannel("[cspacer04]Default Channel", nullptr)); + } + if(!this->default_tree->getDefaultChannel()) { + this->default_tree->setDefaultChannel(*this->default_tree->channels().begin()); + } assert(this->default_tree->getDefaultChannel()); } diff --git a/shared b/shared index 206e005..26981b9 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 206e0052d1dbe64072e1ce145c380b12114d78d5 +Subproject commit 26981b95f70ed4418be0a0e1720eaa7c7fc0a76a