FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a potential crash when OSG is misconfigured, and an appropriate image

Browse Source 
loading plugin cannot be found.
This commit is contained in:
jmt
2008-12-26 11:42:04 +00:00
parent 74a4144193
commit ac57eab8ac
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/ModelRegistry.cxx
+5
View File
@@ -345,6 +345,11 @@ ModelRegistry::readImage(const string& fileName,
Registry* registry = Registry::instance(); Registry* registry = Registry::instance();
ReaderWriter::ReadResult res; ReaderWriter::ReadResult res;
res = registry->readImageImplementation(absFileName, opt); res = registry->readImageImplementation(absFileName, opt);
if (!res.success()) {
SG_LOG(SG_IO, SG_WARN, "Image loading failed:" << res.message());
return res;
}
if (res.loadedFromCache()) if (res.loadedFromCache())
SG_LOG(SG_IO, SG_INFO, "Returning cached image \"" SG_LOG(SG_IO, SG_INFO, "Returning cached image \""
<< res.getImage()->getFileName() << "\""); << res.getImage()->getFileName() << "\"");