[Gemrb-commits] gemrb: branch master updated. 2b69c2809a8e70c813808d4e7e4b290a06f533da

[Alyssa M. <fu...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  2b69c2809a8e70c813808d4e7e4b290a06f533da (commit)

Summary of changes:
 gemrb/plugins/KEYImporter/KEYImporter.cpp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
      from  38e5b9ed352c81bae0a2102b0f875032115ae729 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=2b69c2809a8e70c813808d4e7e4b290a06f533da

commit 2b69c2809a8e70c813808d4e7e4b290a06f533da
Author: Tom Prince <tom...@ua...>
Date:   Fri Apr 2 14:40:21 2010 -0400

    KEYImporter: Check for all possible resource types in a bif.

diff --git a/gemrb/plugins/KEYImporter/KEYImporter.cpp b/gemrb/plugins/KEYImporter/KEYImporter.cpp
index a1defcf..23d4765 100644
--- a/gemrb/plugins/KEYImporter/KEYImporter.cpp
+++ b/gemrb/plugins/KEYImporter/KEYImporter.cpp
@@ -496,7 +496,9 @@ Resource* KeyImp::GetResource(const char* resname, const std::vector<ResourceDes
 				strnlwrcpy( ret->filename, resname, 8 );
 				strcat( ret->filename, types[j].GetExt() );
 
-				return types[j].Create(ret);
+				Resource *res = types[j].Create(ret);
+				if (res)
+					return res;
 			}
 		}
 	}

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator