From b5a823fd9338a39d01571d052e5a1de5dc3e4ac7 Mon Sep 17 00:00:00 2001 From: ehouse Date: Sun, 28 Sep 2008 16:43:24 +0000 Subject: [PATCH] Fix crash when switching to game with same-language dict: inform draw even if tile sets the same since old is about to be destroyed. --- common/board.c | 2 +- common/mempool.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/board.c b/common/board.c index 45447a146..15e961d2b 100644 --- a/common/board.c +++ b/common/board.c @@ -2932,7 +2932,7 @@ dictChanged( void* p_board, const DictionaryCtxt* oldDict, { BoardCtxt* board = (BoardCtxt*)p_board; XP_ASSERT( !!board->draw ); - if ( NULL == oldDict || !dict_tilesAreSame( oldDict, newDict ) ) { + if ( (NULL == oldDict) || (oldDict != newDict) ) { draw_dictChanged( board->draw, newDict ); } } diff --git a/common/mempool.c b/common/mempool.c index c61204f40..92ef1346a 100644 --- a/common/mempool.c +++ b/common/mempool.c @@ -101,7 +101,7 @@ mpool_destroy( MemPoolCtx* mpool ) MemPoolEntry* entry; for ( entry = mpool->usedList; !!entry; entry = entry->next ) { #ifndef FOR_GREMLINS /* I don't want to hear about this right now */ - XP_LOGF( XP_P " from ln %ld of %s\n", + XP_LOGF( "%s: " XP_P " from ln %ld of %s\n", __func__, entry->ptr, entry->lineNo, entry->fileName ); #ifdef DEBUG {