[Scummvm-cvs-logs] scummvm master -> a35aa07c7911010d21bb79209d88b07ddbfd7c30

[dreammaster]

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:
a35aa07c79 MADS: Fix crash looking at fishing rod in restaurant


Commit: a35aa07c7911010d21bb79209d88b07ddbfd7c30
    https://github.com/scummvm/scummvm/commit/a35aa07c7911010d21bb79209d88b07ddbfd7c30
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-03-07T17:43:15-05:00

Commit Message:
MADS: Fix crash looking at fishing rod in restaurant

Changed paths:
    engines/mads/nebular/nebular_scenes5.cpp



diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index dea5f67..b297d20 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -2427,7 +2427,8 @@ void Scene512::actions() {
 		_vm->_dialogs->show(51225);
 	else if (_action.isAction(VERB_LOOK, NOUN_PADLOCK_KEY) && _game._objects.isInRoom(OBJ_PADLOCK_KEY))
 		_vm->_dialogs->show(51215);
-	else if (_action.isAction(VERB_LOOK, NOUN_FISHING_ROD) && (_scene->_activeAnimation->getCurrentFrame() == 4))
+	else if (_action.isAction(VERB_LOOK, NOUN_FISHING_ROD) && (!_scene->_activeAnimation ||
+			_scene->_activeAnimation->getCurrentFrame() == 4))
 		_vm->_dialogs->show(51216);
 	else if (_action.isAction(VERB_LOOK, NOUN_SHIPS_WHEEL))
 		_vm->_dialogs->show(51218);