From d7e9d7fb2745d2153db31b6a08fe30cb9b1dd7b4 Mon Sep 17 00:00:00 2001
From: jsalmon3 <>
Date: Sun, 24 Nov 2002 04:23:46 +0000
Subject: [PATCH] Fixed crash when cleaning up menu-net-connecting
---
src/ui/menus.cpp | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/ui/menus.cpp b/src/ui/menus.cpp
index 4b46d6faf..00eb6db99 100644
--- a/src/ui/menus.cpp
+++ b/src/ui/menus.cpp
@@ -237,6 +237,7 @@ local void MultiGameClientDrawFunc(Menuitem *mi);
local void MultiClientUpdate(int initial);
local void NetConnectingInit(Menuitem *mi);
+local void NetConnectingExit(Menuitem *mi);
local void NetConnectingCancel(void);
local void TerminateNetConnect(void);
@@ -479,6 +480,7 @@ global void InitMenuFuncHash(void) {
// Net connecting
HASHADD(NetConnectingInit,"net-connecting-init");
+ HASHADD(NetConnectingExit,"net-connecting-exit");
HASHADD(NetConnectingCancel,"net-connecting-cancel");
// Campaign select
@@ -2681,7 +2683,7 @@ local void JoinNetGameMenu(void)
}
/**
-** Cancel button of network connect menu pressed.
+** Network connect menu init.
*/
local void NetConnectingInit(Menuitem *mi)
{
@@ -2689,13 +2691,20 @@ local void NetConnectingInit(Menuitem *mi)
mi->menu->items[2].d.text.text = NetTriesText;
}
+/**
+** Network connect menu exit.
+*/
+local void NetConnectingExit(Menuitem *mi)
+{
+ mi->menu->items[1].d.text.text = NULL;
+ mi->menu->items[2].d.text.text = NULL;
+}
+
/**
** Cancel button of network connect menu pressed.
*/
local void NetConnectingCancel(void)
{
- Menu *menu;
-
VideoLockScreen();
MenusSetBackground();
VideoUnlockScreen();
@@ -2703,10 +2712,6 @@ local void NetConnectingCancel(void)
// Trigger TerminateNetConnect() to call us again and end the menu
NetLocalState = ccs_usercanceled;
EndMenu();
-
- menu = FindMenu("menu-net-connecting");
- menu->items[1].d.text.text = NULL;
- menu->items[2].d.text.text = NULL;
}
/**