diff options
| author | Paul Gilbert | 2016-11-03 21:51:22 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-11-03 21:51:22 -0400 |
| commit | c32be8ebeb45558cf2eb20c199bb06218f55d2fb (patch) | |
| tree | 88c84290250d943db384988679e8e72b8771a750 | |
| parent | c3e026564a0bf3805fc2c74de7062f2bad435b75 (diff) | |
| download | scummvm-rg350-c32be8ebeb45558cf2eb20c199bb06218f55d2fb.tar.gz scummvm-rg350-c32be8ebeb45558cf2eb20c199bb06218f55d2fb.tar.bz2 scummvm-rg350-c32be8ebeb45558cf2eb20c199bb06218f55d2fb.zip | |
TITANIC: Fix copying concepts in getFrameEntry
| -rw-r--r-- | engines/titanic/true_talk/tt_sentence.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/titanic/true_talk/tt_sentence.cpp b/engines/titanic/true_talk/tt_sentence.cpp index 3fae527770..9d7ea961f4 100644 --- a/engines/titanic/true_talk/tt_sentence.cpp +++ b/engines/titanic/true_talk/tt_sentence.cpp @@ -265,7 +265,9 @@ TTconcept *TTsentence::getFrameEntry(int slotIndex, const TTconceptNode *concept TTconcept *TTsentence::getFrameSlot(int slotIndex, const TTconceptNode *conceptNode) const { TTconcept *newConcept = new TTconcept(); TTconcept *concept = getFrameEntry(slotIndex, conceptNode); - newConcept->copyFrom(concept); + + if (concept) + newConcept->copyFrom(concept); if (!newConcept->isValid()) { delete newConcept; |