mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-18 14:11:15 +02:00
Code Issues Projects Releases Wiki Activity

- some bugfixes discovered while testing in windows, related to files not found checking

Browse Source 
- Fixed debug project settings
This commit is contained in:
Mark Vejvoda
2011-05-25 22:41:19 +00:00
parent 4b47c79af5
commit 3eaabb1b41
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/shared_lib/sources/util/properties.cpp
View File

@@ -47,14 +47,15 @@ void Properties::load(const string &path, bool clearCurrentProperties) {
this->path= path;
#if defined(WIN32) && !defined(__MINGW32__)
FILE *fp = _wfopen(utf8_decode(path).c_str(), L"r");
wstring wstr = utf8_decode(path);
FILE *fp = _wfopen(wstr.c_str(), L"r");
ifstream fileStream(fp);
#else
ifstream fileStream;
fileStream.open(path.c_str(), ios_base::in);
#endif
if(fileStream.fail()){
if(fileStream.is_open() == false){
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] path = [%s]\n",__FILE__,__FUNCTION__,__LINE__,path.c_str());
throw runtime_error("Can't open propertyMap file: " + path);
}
@@ -111,7 +112,9 @@ void Properties::load(const string &path, bool clearCurrentProperties) {
fileStream.close();
#if defined(WIN32) && !defined(__MINGW32__)
fclose(fp);
if(fp) {
fclose(fp);
}
#endif
}