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

- bugfixes on windows platform when some folders and files are missing, do not crash hard.

Browse Source
This commit is contained in:
SoftCoder
2013-12-27 23:05:20 -08:00
parent 163a5a173a
commit b6cd751250
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/shared_lib/include/graphics/FileReader.h
View File

@@ -171,14 +171,14 @@ static inline T* readFromFileReaders(vector<FileReader<T> const *>* readers, con
if (ret != NULL) {
file.close();
#if defined(WIN32) && !defined(__MINGW32__)
fclose(fp);
if(fp) fclose(fp);
#endif
return ret;
}
}
file.close();
#if defined(WIN32) && !defined(__MINGW32__)
fclose(fp);
if(fp) fclose(fp);
#endif
return NULL;
@@ -223,14 +223,14 @@ static inline T* readFromFileReaders(vector<FileReader<T> const *>* readers, con
if (ret != NULL) {
file.close();
#if defined(WIN32) && !defined(__MINGW32__)
fclose(fp);
if(fp) fclose(fp);
#endif
return ret;
}
}
file.close();
#if defined(WIN32) && !defined(__MINGW32__)
fclose(fp);
if(fp) fclose(fp);
#endif
return NULL;
}
@@ -368,7 +368,7 @@ T* FileReader<T>::read(const string& filepath) const {
T* ret = read(file,filepath);
file.close();
#if defined(WIN32) && !defined(__MINGW32__)
fclose(fp);
if(fp) fclose(fp);
#endif
return ret;
@@ -393,7 +393,7 @@ T* FileReader<T>::read(const string& filepath, T* object) const {
T* ret = read(file,filepath,object);
file.close();
#if defined(WIN32) && !defined(__MINGW32__)
fclose(fp);
if(fp) fclose(fp);
#endif
return ret;