avoid mempool assertions by cleaning up on way out

This commit is contained in:
ehouse 2009-06-30 12:55:47 +00:00
parent 9b29e45ea4
commit a954286960
2 changed files with 5 additions and 2 deletions

View file

@ -1486,6 +1486,9 @@ cursesmain( XP_Bool isServer, LaunchParams* params )
} }
} }
game_dispose( &g_globals.cGlobals.game ); /* takes care of the dict */
gi_disposePlayerInfo( MEMPOOL &g_globals.cGlobals.params->gi );
#ifdef XWFEATURE_BLUETOOTH #ifdef XWFEATURE_BLUETOOTH
linux_bt_close( &g_globals.cGlobals ); linux_bt_close( &g_globals.cGlobals );
#endif #endif

View file

@ -731,8 +731,6 @@ main( int argc, char** argv )
useCurses = XP_TRUE; useCurses = XP_TRUE;
#endif #endif
do { do {
short index; short index;
opt = getopt( argc, argv, "?" opt = getopt( argc, argv, "?"
@ -1055,6 +1053,8 @@ main( int argc, char** argv )
usage( argv[0], "rtfm" ); usage( argv[0], "rtfm" );
} }
vtmgr_destroy( MPPARM(mainParams.util->mpool) mainParams.vtMgr );
linux_util_vt_destroy( mainParams.util ); linux_util_vt_destroy( mainParams.util );
mpool_destroy( mainParams.util->mpool ); mpool_destroy( mainParams.util->mpool );