mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-21 18:38:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update Ghoul

Browse Source 
Adapted to new ghoul version
This commit is contained in:
Alexander Bock
2015-12-02 22:47:15 -05:00
parent 0006e83f4b
commit ba35b834f7
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/configurationmanager.cpp
+4 -2
View File
@@ -78,8 +78,10 @@ bool ConfigurationManager::loadFromFile(const std::string& filename) {
FileSys.registerPathToken(basePathToken, basePath);
// Loading the configuration file into ourselves
const bool loadingSuccess = ghoul::lua::loadDictionaryFromFile(filename, *this);
if (!loadingSuccess) {
try {
ghoul::lua::loadDictionaryFromFile(filename, *this);
}
catch (...) {
LERROR("Loading dictionary from file failed");
return false;
}