From 2de29e73fa0a8c2f42d72c0370fecd750f76fad1 Mon Sep 17 00:00:00 2001 From: Wanne Date: Thu, 28 Feb 2013 09:56:57 +0000 Subject: [PATCH] - Fixed assertion when clicking on "Multiplayer Game" in Main Menu Screen git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5882 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- MainMenuScreen.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/MainMenuScreen.cpp b/MainMenuScreen.cpp index 4afe228e..1659927e 100644 --- a/MainMenuScreen.cpp +++ b/MainMenuScreen.cpp @@ -351,19 +351,18 @@ void ExitMainMenu( ) CreateDestroyMainMenuButtons( FALSE ); for( iCounter2 = 1; iCounter2 < MAX_ELEMENT; iCounter2++ ) - { + { if (gMainMenulayout[iCounter2].Visible == 1) { + // WANNE: This is a dirty fix. I don't know when that was introduced, but when clicking on "Multiplayer Game", the game crashes when trying to call DeleteVideoSurfaceFromIndex() + if (is_networked && iCounter2 == 1) + continue; + // DeleteVideoObjectFromIndex( gMainMenulayout[iCounter2].uiIndex ); DeleteVideoSurfaceFromIndex( gMainMenulayout[iCounter2].uiIndex ); } } - - - - - gMsgBox.uiExitScreen = MAINMENU_SCREEN; }