diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8ce8e39d6..774f3d996 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -5,6 +5,7 @@ D1X-Rebirth Changelog main/kmatrix.c, main/net_udp.c: Initialise 'playing' to 0 for UDP kmatrix, making sure player progresses to next level; always return 1 when starting to join a UDP game so it doesn't immediately return to the main menu main/gameseq.c, main/menu.c: Hide mission dialog before the level intro screens are shown, make sure it doesn't try to show it again after it was closed - fixing bad memory access main/game.c: Finally fix bug where if you start a single player game then a multiplayer game, time is stopped. Always start time if it's stopped and the game window is activated +main/menu.c: Check menus[0], not menus[i] in hide_menus - fixing possible crash 20100326 -------- diff --git a/main/menu.c b/main/menu.c index 488629574..6eb47fc2b 100644 --- a/main/menu.c +++ b/main/menu.c @@ -131,7 +131,7 @@ void hide_menus(void) window *wind; int i; - if (menus[i]) + if (menus[0]) return; // there are already hidden menus for (i = 0; (i < 15) && (wind = window_get_front()); i++)