Merge pull request #31 from xoddark/Werror_conversion-null

Fix conversion-null warning
This commit is contained in:
Timothee "TTimo" Besset
2011-12-29 09:43:34 -08:00
6 changed files with 8 additions and 8 deletions

View File

@@ -475,7 +475,7 @@ int idDict::FindKeyIndex( const char *key ) const {
if ( key == NULL || key[0] == '\0' ) {
idLib::common->DWarning( "idDict::FindKeyIndex: empty key" );
return NULL;
return 0;
}
int hash = argHash.GenerateKey( key, false );