From 2c28a1e12d5d4cdfbf585a2d9995f9879e3e7c83 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 29 Aug 2015 21:38:08 -0400
Subject: SHERLOCK: RT: Fix crash visiting Lawton's house after he's fled

---
 engines/sherlock/objects.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/sherlock/objects.cpp')

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index b2ffdfbacc..093f666a46 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -350,10 +350,10 @@ bool BaseObject::checkEndOfSequence() {
 	if (_type == REMOVE || _type == INVALID)
 		return false;
 
-	if (_sequences[_frameNumber] == 0 || _frameNumber >= checkFrame) {
+	if (_frameNumber < 0 || _frameNumber >= checkFrame || _sequences[_frameNumber] == 0) {
 		result = true;
 
-		if (_frameNumber >= (checkFrame - 1)) {
+		if (_frameNumber < 0 || _frameNumber >= (checkFrame - 1)) {
 			_frameNumber = START_FRAME;
 		}  else {
 			// Determine next sequence to use
-- 
cgit v1.2.3