mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r1540) -Fix: since grf files are reopened on every load/new game, close the old opened to fix stale filehandles (thx tamlin)

release/0.4.5
darkvater 2005-01-16 12:40:25 +00:00
parent 8efc7866dd
commit 340a9ab6be
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fileio.c
View File

@ -83,16 +83,20 @@ void FioReadBlock(void *ptr, uint size)
fread(ptr, 1, size, _fio.cur_fh); fread(ptr, 1, size, _fio.cur_fh);
} }
static inline void FioCloseFile(int slot)
{
if (_fio.handles[slot] != NULL) {
fclose(_fio.handles[slot]);
_fio.handles[slot] = NULL;
}
}
void FioCloseAll(void) void FioCloseAll(void)
{ {
int i; int i;
for (i = 0; i != lengthof(_fio.handles); i++) { for (i = 0; i != lengthof(_fio.handles); i++)
if (_fio.handles[i] != NULL) { FioCloseFile(i);
fclose(_fio.handles[i]);
_fio.handles[i] = NULL;
}
}
} }
void FioOpenFile(int slot, const char *filename) void FioOpenFile(int slot, const char *filename)
@ -126,6 +130,7 @@ void FioOpenFile(int slot, const char *filename)
if (f == NULL) if (f == NULL)
error("Cannot open file '%s'", buf); error("Cannot open file '%s'", buf);
FioCloseFile(slot); // if file was opened before, close it
_fio.handles[slot] = f; _fio.handles[slot] = f;
FioSeekToFile(slot << 24); FioSeekToFile(slot << 24);
} }