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

fixed first instance setup miracle

Browse Source
This commit is contained in:
WolverinDEV 2019-07-21 10:57:01 +02:00
parent 98929707ae
commit d3cc5984e5
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/InstanceHandler.cpp
View File

@ -111,7 +111,7 @@ InstanceHandler::InstanceHandler(SqlDataManager *sql) : sql(sql) {
this->groupManager = std::make_shared<GroupManager>(nullptr, this->getSql()); this->groupManager = std::make_shared<GroupManager>(nullptr, this->getSql());
this->groupManager->loadGroupFormDatabase(); this->groupManager->loadGroupFormDatabase();
if (this->groupManager->availableServerGroups(false).empty()){ if (this->groupManager->availableServerGroups(false).empty()) {
if(!this->setupDefaultGroups()){ if(!this->setupDefaultGroups()){
logCritical(LOG_INSTANCE, "Could not setup server instance! Stopping..."); logCritical(LOG_INSTANCE, "Could not setup server instance! Stopping...");
mainThreadActive = false; mainThreadActive = false;

1
server/src/InstanceHandlerSetup.cpp
View File

@ -141,6 +141,7 @@ bool InstanceHandler::setupDefaultGroups() {
} }
} }
} }
this->save_group_permissions();
this->getSql()->pool->threads()->wait_for(); //Wait for all permissions to flush this->getSql()->pool->threads()->wait_for(); //Wait for all permissions to flush
return true; return true;
} }