From bbc810e909cd3403593be447cfa39db8b7bcefd1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 24 Mar 2016 13:19:29 -0400
Subject: TITANIC: Fix crash when looking at television

---
 engines/titanic/core/view_item.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/titanic/core/view_item.cpp b/engines/titanic/core/view_item.cpp
index 8b6586f7f9..b0e30f5072 100644
--- a/engines/titanic/core/view_item.cpp
+++ b/engines/titanic/core/view_item.cpp
@@ -146,7 +146,8 @@ void CViewItem::enterView(CViewItem *newView) {
 			CPetControl *petControl = nullptr;
 			if (newRoom != nullptr) {
 				petControl = newRoom->getRoot()->getPetControl();
-				petControl->enterNode(newNode);
+				if (petControl)
+					petControl->enterNode(newNode);
 			}
 
 			if (newRoom != oldRoom) {
-- 
cgit v1.2.3