From 67da4df55171e3dd15465cf55d7a6d9f5282fcb2 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Sun, 13 Jan 2013 22:05:58 +0000
Subject: Fix FS_FOpenFileRead corner case

FS_FOpenFileRead is a fairly mental function that changes its return
behaviour depending on whether or not file is NULL or not. It turns out
in the case where file is NULL, we were returning the wrong value when
the file didn't exist.
---
 src/qcommon/files.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/qcommon')

diff --git a/src/qcommon/files.c b/src/qcommon/files.c
index a71c9b70..4e1aef13 100644
--- a/src/qcommon/files.c
+++ b/src/qcommon/files.c
@@ -1322,10 +1322,17 @@ long FS_FOpenFileRead(const char *filename, fileHandle_t *file, qboolean uniqueF
 		fprintf(missingFiles, "%s\n", filename);
 #endif
 
-        if(file)
-        	*file = 0;
-        	
-	return -1;
+	if(file)
+	{
+		*file = 0;
+		return -1;
+	}
+	else
+	{
+		// When file is NULL, we're querying the existance of the file
+		// If we've got here, it doesn't exist
+		return 0;
+	}
 }
 
 /*
-- 
cgit