shithub: choc

Download patch

ref: 32d566f7a2171eacb9b6713a9d1f98e3a1db6be6
parent: daa2dde19e2b1d27477eaa618157551d3fcd84bb
author: Simon Howard <fraggle@gmail.com>
date: Sat Oct 22 09:38:13 EDT 2011 

Fix crash when pressing escape in help screens.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2453


--- a/src/heretic/mn_menu.c
+++ b/src/heretic/mn_menu.c
@@ -1599,7 +1599,10 @@
 
 void MN_DeactivateMenu(void)
 {
-    CurrentMenu->oldItPos = CurrentItPos;
+    if (CurrentMenu != NULL)
+    {
+        CurrentMenu->oldItPos = CurrentItPos;
+    }
     MenuActive = false;
     if (!netgame)
     {
--- a/src/hexen/mn_menu.c
+++ b/src/hexen/mn_menu.c
@@ -1723,7 +1723,10 @@
 
 void MN_DeactivateMenu(void)
 {
-    CurrentMenu->oldItPos = CurrentItPos;
+    if (CurrentMenu != NULL)
+    {
+        CurrentMenu->oldItPos = CurrentItPos;
+    }
     MenuActive = false;
     if (!netgame)
     {