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

* quick-fix for static initialisation problem in ImageReaders

Browse Source 
* fix error in two part NetworkMessageCommandList receive
This commit is contained in:
James McCulloch
2010-03-24 13:39:08 +00:00
parent e91c15b9e2
commit dfc32cdba2
5 changed files with 476 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -265,7 +265,7 @@ T* FileReader<T>::read(const string& filepath, T* object) const {
if (!file.is_open()) { //An error occured; TODO: Which one - throw an exception, print error message?
throw runtime_error("Could not open file " + filepath);
}
read(file,filepath,object);
return read(file,filepath,object);
}

3
source/shared_lib/include/graphics/ImageReaders.h
View File

@@ -31,7 +31,8 @@ namespace ImageRegisterer {
bool registerImageReaders();
//Since you can't call void methods here, I have used a method doing nothing except initializing the image Readers
static bool readersRegistered = registerImageReaders(); //should always return true, this should guarantee that the readers are registered <--> ImageReaders is included anywhere
// this static initialisation relies on other static initialisations. == bad! [was quick-fixed, registerImageReaders() is called from main()]
// static bool readersRegistered = registerImageReaders(); //should always return true, this should guarantee that the readers are registered <--> ImageReaders is included anywhere
}
}} //end namespace