aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-08-28 01:10:46 +0000
committerthilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-08-28 01:10:46 +0000
commitd8b9d3ac7979a14fb3d77c2d8417ad685b6228fb (patch)
tree44a18851ad1f6501e9d48a5b0180f2ef93059e1b
parentc200b936e78a1d7fa6326aff5fb15699f9b78f3d (diff)
downloadioquake3-aero-d8b9d3ac7979a14fb3d77c2d8417ad685b6228fb.tar.gz
ioquake3-aero-d8b9d3ac7979a14fb3d77c2d8417ad685b6228fb.zip
More fixes for the FS_Shutdown change. Declare qconsole.log as closed before FS_Shutdown
closes all files. git-svn-id: svn://svn.icculus.org/quake3/trunk@879 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--code/qcommon/common.c3
-rw-r--r--code/qcommon/files.c3
-rw-r--r--code/qcommon/qcommon.h1
3 files changed, 5 insertions, 2 deletions
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index efb7851..f3a2360 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -51,8 +51,7 @@ char *com_argv[MAX_NUM_ARGVS+1];
jmp_buf abortframe; // an ERR_DROP occured, exit the entire frame
-FILE *debuglogfile;
-static fileHandle_t logfile;
+fileHandle_t logfile;
fileHandle_t com_journalFile; // events are written here
fileHandle_t com_journalDataFile; // config files are written here
diff --git a/code/qcommon/files.c b/code/qcommon/files.c
index 0d70db2..3412035 100644
--- a/code/qcommon/files.c
+++ b/code/qcommon/files.c
@@ -2719,6 +2719,9 @@ void FS_Shutdown( qboolean closemfp ) {
searchpath_t *p, *next;
int i;
+ // logfile will now get closed.
+ logfile = 0;
+
for(i = 0; i < MAX_FILE_HANDLES; i++) {
if (fsh[i].handleFiles.file.o) {
FS_FCloseFile(i);
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 3c53ae0..f4f1a69 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -776,6 +776,7 @@ extern int com_frameMsec;
extern qboolean com_errorEntered;
+extern fileHandle_t logfile;
extern fileHandle_t com_journalFile;
extern fileHandle_t com_journalDataFile;