From 07fdcdf312e5498508affe825db37a6f1644f738 Mon Sep 17 00:00:00 2001
From: richiesams
Date: Sat, 31 Aug 2013 18:09:24 -0500
Subject: ZVISION: Only do return pathing after the mouse is captured

---
 engines/zvision/lever_control.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'engines/zvision')

diff --git a/engines/zvision/lever_control.cpp b/engines/zvision/lever_control.cpp
index 91e54075b6..744fde1e1c 100644
--- a/engines/zvision/lever_control.cpp
+++ b/engines/zvision/lever_control.cpp
@@ -203,12 +203,14 @@ void LeverControl::onMouseUp(const Common::Point &screenSpacePos, const Common::
 		return;
 	}
 	
-	_mouseIsCaptured = false;
-	_engine->getScriptManager()->setStateValue(_key, _currentFrame);
+	if (_mouseIsCaptured) {
+		_mouseIsCaptured = false;
+		_engine->getScriptManager()->setStateValue(_key, _currentFrame);
 
-	_isReturning = true;
-	_returnRoutesCurrentProgress = _frameInfo[_currentFrame].returnRoute.begin();
-	_returnRoutesCurrentFrame = _currentFrame;
+		_isReturning = true;
+		_returnRoutesCurrentProgress = _frameInfo[_currentFrame].returnRoute.begin();
+		_returnRoutesCurrentFrame = _currentFrame;
+	}
 }
 
 bool LeverControl::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
-- 
cgit v1.2.3