diff options
| author | Paul Gilbert | 2016-03-24 13:19:29 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-03-24 13:19:29 -0400 |
| commit | bbc810e909cd3403593be447cfa39db8b7bcefd1 (patch) | |
| tree | 8bcc813597750a8f1e22321cef179a82d32d1c86 | |
| parent | 71c0ad236e4a5f9c957c936a6084e4c519e626c7 (diff) | |
| download | scummvm-rg350-bbc810e909cd3403593be447cfa39db8b7bcefd1.tar.gz scummvm-rg350-bbc810e909cd3403593be447cfa39db8b7bcefd1.tar.bz2 scummvm-rg350-bbc810e909cd3403593be447cfa39db8b7bcefd1.zip | |
TITANIC: Fix crash when looking at television
| -rw-r--r-- | engines/titanic/core/view_item.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |