flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

A fix that is better than #950.

Browse Source
This commit is contained in:
Alexander Harkness 2014-05-25 18:32:42 +01:00
parent 882e8e044c
commit 50e29aba77
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/GroupManager.cpp
View File

@ -45,8 +45,14 @@ cGroupManager::cGroupManager()
{ {
LOGD("-- Loading Groups --"); LOGD("-- Loading Groups --");
LoadGroups(); if (!LoadGroups())
CheckUsers(); {
LOGWARNING("ERROR: Groups could not load!");
}
if (!CheckUsers())
{
LOGWARNING("ERROR: User file could not be found!");
}
LOGD("-- Groups Successfully Loaded --"); LOGD("-- Groups Successfully Loaded --");
} }
@ -70,13 +76,13 @@ void cGroupManager::GenerateDefaultUsersIni(cIniFile & a_IniFile)
void cGroupManager::CheckUsers(void) bool cGroupManager::CheckUsers()
{ {
cIniFile IniFile; cIniFile IniFile;
if (!IniFile.ReadFile("users.ini")) if (!IniFile.ReadFile("users.ini"))
{ {
GenerateDefaultUsersIni(IniFile); GenerateDefaultUsersIni(IniFile);
return; return true;
} }
int NumKeys = IniFile.GetNumKeys(); int NumKeys = IniFile.GetNumKeys();
@ -97,13 +103,15 @@ void cGroupManager::CheckUsers(void)
} }
} // for itr - Split[] } // for itr - Split[]
} // for i - ini file keys } // for i - ini file keys
// Always return true for now, just but we can handle writefile fails later.
return true
} }
void cGroupManager::LoadGroups() bool cGroupManager::LoadGroups()
{ {
cIniFile IniFile; cIniFile IniFile;
if (!IniFile.ReadFile("groups.ini")) if (!IniFile.ReadFile("groups.ini"))
@ -180,6 +188,8 @@ void cGroupManager::LoadGroups()
} }
} }
} }
// Always return true, we can handle writefile fails later.
return true
} }