[Scummvm-cvs-logs] scummvm master -> 52be12830b7fdce9c0d632d3a292cd7cc6d98d1d

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
52be12830b NEVERHOOD: Fix crash in scene 1105 (teddy bear panel)


Commit: 52be12830b7fdce9c0d632d3a292cd7cc6d98d1d
    https://github.com/scummvm/scummvm/commit/52be12830b7fdce9c0d632d3a292cd7cc6d98d1d
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-06-02T01:54:37-07:00

Commit Message:
NEVERHOOD: Fix crash in scene 1105 (teddy bear panel)

Leaving the panel in scene 1105 only worked if the panel was open.
If the panel was closed, nothing would happen on the first click,
and on the second it would crash. If I understood this correctly,
it was because trying to leave while the panel was closed would
(incorrectly) mark it as open, and then it would crash when trying
to remove the objects behind the panel from the scene.

Changed paths:
    engines/neverhood/modules/module1100.cpp



diff --git a/engines/neverhood/modules/module1100.cpp b/engines/neverhood/modules/module1100.cpp
index 5a5e52e..c4d90b5 100644
--- a/engines/neverhood/modules/module1100.cpp
+++ b/engines/neverhood/modules/module1100.cpp
@@ -465,7 +465,7 @@ uint32 Scene1105::handleMessage(int messageNum, const MessageParam &param, Entit
 					_backgroundIndex = 15;
 					SetUpdateHandler(&Scene1105::upClosePanel);
 				} else
-					_isPanelOpen = true;
+					_isClosePanelDone = true;
 				_leaveResult = 0;
 			}
 		}