[Scummvm-git-logs] scummvm master -> 8637cfc617d57bb9ea1e3f81f16c7b4f9f5b38ee

[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:
8637cfc617 TITANIC: Fix CMouseCursor assert after trying to drag perch


Commit: 8637cfc617d57bb9ea1e3f81f16c7b4f9f5b38ee
    https://github.com/scummvm/scummvm/commit/8637cfc617d57bb9ea1e3f81f16c7b4f9f5b38ee
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-19T08:30:19-05:00

Commit Message:
TITANIC: Fix CMouseCursor assert after trying to drag perch

Changed paths:
    engines/titanic/core/drop_target.cpp
    engines/titanic/input_handler.cpp


diff --git a/engines/titanic/core/drop_target.cpp b/engines/titanic/core/drop_target.cpp
index 8165d58..f02efee 100644
--- a/engines/titanic/core/drop_target.cpp
+++ b/engines/titanic/core/drop_target.cpp
@@ -113,9 +113,10 @@ bool CDropTarget::DropObjectMsg(CDropObjectMsg *msg) {
 }
 
 bool CDropTarget::MouseDragStartMsg(CMouseDragStartMsg *msg) {
+	CTreeItem *dragItem = msg->_dragItem;
 	if (!checkStartDragging(msg))
 		return false;
-	//msg->_dragItem = msg->_dragItem;
+	msg->_dragItem = dragItem;
 
 	CGameObject *obj = dynamic_cast<CGameObject *>(findByName(_itemName));
 	if (_itemName.empty() || _fieldF4 || !obj)
diff --git a/engines/titanic/input_handler.cpp b/engines/titanic/input_handler.cpp
index e4c60d2..ba2c08e 100644
--- a/engines/titanic/input_handler.cpp
+++ b/engines/titanic/input_handler.cpp
@@ -100,8 +100,8 @@ void CInputHandler::processMessage(CMessage *msg) {
 					CMouseDragMoveMsg moveMsg(_mousePos);
 					moveMsg.execute(_dragItem);
 				}
-			} else {
-				if (mouseMsg->isButtonUpMsg() && _dragItem) {
+			} else if (mouseMsg->isButtonUpMsg()) {
+				if (_dragItem) {
 					// Mouse drag ended
 					CGameObject *target = dragEnd(_mousePos, _dragItem);
 					CMouseDragEndMsg endMsg(_mousePos, target);