From d8b9d3ac7979a14fb3d77c2d8417ad685b6228fb Mon Sep 17 00:00:00 2001 From: thilo Date: Mon, 28 Aug 2006 01:10:46 +0000 Subject: 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 --- code/qcommon/common.c | 3 +-- code/qcommon/files.c | 3 +++ code/qcommon/qcommon.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'code/qcommon') 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; -- cgit v1.2.3