From a328f32fed85743f85b26876b9ade388d4eb0bbd Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Tue, 13 Dec 2011 21:02:28 -0500
Subject: PEGASUS: Fix going from bomb game to the end game

The game is now completable from after completing from a save that has Norad complete.
---
 engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'engines/pegasus')

diff --git a/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp b/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp
index 43de5e73e6..9ec3124251 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp
@@ -1209,6 +1209,15 @@ void CaldoriaBomb::closeInteraction() {
 	_timer.stopDisplaying();
 	_grid.hide();
 	_grid.stopDisplaying();
+
+	// The original did not do this, but we need it here
+	// Not sure why the original worked without this; probably
+	// related to the way the List code worked in CodeWarrior.
+	// If this is not here, the notifications will later attempt
+	// to remove itself from this receiver causing a very nasty
+	// crash.
+	_timerNotification.cancelNotification(this);
+	_neighborhoodNotification->cancelNotification(this);
 }
 
 void CaldoriaBomb::startBombAmbient(Common::String ambient) {
-- 
cgit v1.2.3