Skip to content
Permalink
Browse files
Platform deinit should happen last, since other deinit bits might dep…
…end on it.
  • Loading branch information
icculus committed Sep 8, 2016
1 parent dfd658f commit ab7eb81a4a519f8379e5a2d09dd527662a474397
Showing with 4 additions and 2 deletions.
  1. +4 −2 src/physfs.c
@@ -1286,8 +1286,6 @@ static void freeArchivers(void)

static int doDeinit(void)
{
BAIL_IF_MACRO(!__PHYSFS_platformDeinit(), ERRPASS, 0);

closeFileHandleList(&openWriteList);
BAIL_IF_MACRO(!PHYSFS_setWriteDir(NULL), PHYSFS_ERR_FILES_STILL_OPEN, 0);

@@ -1335,6 +1333,10 @@ static int doDeinit(void)
allocator.Deinit();

errorLock = stateLock = NULL;

/* !!! FIXME: what on earth are you supposed to do if this fails? */
BAIL_IF_MACRO(!__PHYSFS_platformDeinit(), ERRPASS, 0);

return 1;
} /* doDeinit */

0 comments on commit ab7eb81

Please sign in to comment.