From 64f9ffa03241183b5d44d860290a919462b2430c Mon Sep 17 00:00:00 2001 From: Joel Teichroeb Date: Fri, 17 Jun 2011 17:11:08 -0700 Subject: [PATCH] Fix crash when trying to change to the current scene. Fixes #245 --- engines/grim/grim.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/engines/grim/grim.cpp b/engines/grim/grim.cpp index 3ee25b0553e..218939bcd4d 100644 --- a/engines/grim/grim.cpp +++ b/engines/grim/grim.cpp @@ -1477,6 +1477,8 @@ void GrimEngine::setScene(const char *name) { } void GrimEngine::setScene(Scene *scene) { + if (scene == _currScene) + return; Scene *lastScene = _currScene; _currScene = scene; _currScene->setSoundParameters(20, 127);