diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 707cdec10..2c7c7eaeb 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,6 @@ -January 2, 2010 (Changes by Graf Zahl) +January 2, 2010 (Changes by Graf Zahl) +- fixed: Trying to show a popup crashed in the SBARINFO code because of a + missing NULL pointer check. - fixed: The ACS thinker needs its own statnum above all actors. Otherwise order of execution is not guaranteed. - fixed: Only ActorMovers should go into STAT_ACTORMOVER, not all PathFollowers. diff --git a/src/g_shared/sbarinfo.cpp b/src/g_shared/sbarinfo.cpp index 9a2fe38a4..ccc8ff4af 100644 --- a/src/g_shared/sbarinfo.cpp +++ b/src/g_shared/sbarinfo.cpp @@ -967,7 +967,7 @@ public: script->popups[currentPopup-1].open(); } - lastPopup->Tick(NULL, this, false); + if (lastPopup != NULL) lastPopup->Tick(NULL, this, false); } script->huds[lastHud]->Tick(NULL, this, false);