Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bugfix for g3d viewer to work with windows openwith

This commit is contained in:
Mark Vejvoda 2011-03-11 23:48:16 +00:00
parent 9eb1f60048
commit be5ac6c9e4
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/g3d_viewer/main.cpp
View File

@ -2060,6 +2060,9 @@ int App::MainLoop(){
}
int App::OnExit(){
SystemFlags::Close();
SystemFlags::SHUTDOWN_PROGRAM_MODE=true;
return 0;
}

5
source/glest_game/global/config.cpp
View File

@ -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;
}
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());
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) {
fileName.second = properties.first.getString("UserOverrideFile") + fileNameParameter.second;
}
}
else if(cfgType.first == cfgMainKeys) {
Config &mainCfg = Config::getInstance();