- bugfix for g3d viewer to work with windows openwith
This commit is contained in:
parent
9eb1f60048
commit
be5ac6c9e4
|
@ -2060,6 +2060,9 @@ int App::MainLoop(){
|
||||||
}
|
}
|
||||||
|
|
||||||
int App::OnExit(){
|
int App::OnExit(){
|
||||||
|
SystemFlags::Close();
|
||||||
|
SystemFlags::SHUTDOWN_PROGRAM_MODE=true;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -97,6 +97,10 @@ Config::Config(std::pair<ConfigType,ConfigType> type, std::pair<string,string> f
|
||||||
fileName.second = getGameReadWritePath(GameConstants::path_ini_CacheLookupKey) + fileName.second;
|
fileName.second = getGameReadWritePath(GameConstants::path_ini_CacheLookupKey) + fileName.second;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(fileMustExist.first == true && fileExists(fileName.first) == false) {
|
||||||
|
string currentpath = extractDirectoryPathFromFile(Properties::getApplicationPath());
|
||||||
|
fileName.first = currentpath + fileName.first;
|
||||||
|
}
|
||||||
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] cfgFile.first = [%s]\n",__FILE__,__FUNCTION__,__LINE__,fileName.first.c_str());
|
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] cfgFile.first = [%s]\n",__FILE__,__FUNCTION__,__LINE__,fileName.first.c_str());
|
||||||
|
|
||||||
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("-=-=-=-=-=-=-= About to load fileName.first = [%s]\n",fileName.first.c_str());
|
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("-=-=-=-=-=-=-= About to load fileName.first = [%s]\n",fileName.first.c_str());
|
||||||
|
@ -118,7 +122,6 @@ Config::Config(std::pair<ConfigType,ConfigType> type, std::pair<string,string> f
|
||||||
else if(properties.first.getString("UserOverrideFile", defaultNotFoundValue.c_str()) != defaultNotFoundValue) {
|
else if(properties.first.getString("UserOverrideFile", defaultNotFoundValue.c_str()) != defaultNotFoundValue) {
|
||||||
fileName.second = properties.first.getString("UserOverrideFile") + fileNameParameter.second;
|
fileName.second = properties.first.getString("UserOverrideFile") + fileNameParameter.second;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else if(cfgType.first == cfgMainKeys) {
|
else if(cfgType.first == cfgMainKeys) {
|
||||||
Config &mainCfg = Config::getInstance();
|
Config &mainCfg = Config::getInstance();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user