[Scummvm-git-logs] scummvm master -> c32be8ebeb45558cf2eb20c199bb06218f55d2fb

[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:
c32be8ebeb TITANIC: Fix copying concepts in getFrameEntry


Commit: c32be8ebeb45558cf2eb20c199bb06218f55d2fb
    https://github.com/scummvm/scummvm/commit/c32be8ebeb45558cf2eb20c199bb06218f55d2fb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-03T21:51:22-04:00

Commit Message:
TITANIC: Fix copying concepts in getFrameEntry

Changed paths:
    engines/titanic/true_talk/tt_sentence.cpp



diff --git a/engines/titanic/true_talk/tt_sentence.cpp b/engines/titanic/true_talk/tt_sentence.cpp
index 3fae527..9d7ea96 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;