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

[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:
c6dd30c68e TITANIC: Fix infinite loop in CViewItem findLink


Commit: c6dd30c68e72edefceb1c287bc790e04c5668e2a
    https://github.com/scummvm/scummvm/commit/c6dd30c68e72edefceb1c287bc790e04c5668e2a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-01T21:16:32-04:00

Commit Message:
TITANIC: Fix infinite loop in CViewItem findLink

Changed paths:
    engines/titanic/core/view_item.cpp



diff --git a/engines/titanic/core/view_item.cpp b/engines/titanic/core/view_item.cpp
index 333b092..af23fca 100644
--- a/engines/titanic/core/view_item.cpp
+++ b/engines/titanic/core/view_item.cpp
@@ -168,7 +168,7 @@ void CViewItem::enterView(CViewItem *newView) {
 
 CLinkItem *CViewItem::findLink(CViewItem *newView) {
 	for (CTreeItem *treeItem = getFirstChild(); treeItem;
-			treeItem = scan(treeItem)) {
+			treeItem = treeItem->scan(this)) {
 		CLinkItem *link = dynamic_cast<CLinkItem *>(treeItem);
 		if (link && link->connectsTo(newView))
 			return link;