From 9019f53326c4ec77187d47ae74da95bdf77b9ceb Mon Sep 17 00:00:00 2001
From: bp2008 <bp2008@users.noreply.github.com>
Date: Sat, 26 Aug 2023 15:50:32 -0600
Subject: [PATCH] Version 252: * Fixed a bug introduced in version 251 where
 touchscreen zooming could cause unwanted panning when adding touch points.

---
 ui3.htm    |  2 +-
 ui3/ui3.js | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ui3.htm b/ui3.htm
index 662ad52..151d9da 100644
--- a/ui3.htm
+++ b/ui3.htm
@@ -88,7 +88,7 @@
 		};
 	</script>
 	<script type="text/javascript">
-		var ui_version = "251";
+		var ui_version = "252";
 		var bi_version = "%%VERSION%%";
 		var appPath_raw = "%%VIRTDIR%%";
 		var local_bi_session = "%%SESSION%%";
diff --git a/ui3/ui3.js b/ui3/ui3.js
index 6ca9052..db581e1 100644
--- a/ui3/ui3.js
+++ b/ui3/ui3.js
@@ -6569,22 +6569,23 @@ function RelativePTZ()
 	function Precon_3dPos(e)
 	{
 		if (!videoPlayer.Loading().image.isLive)
-			return;
+			return false;
 
-		currentCam = cameraListLoader.GetCameraWithId(videoPlayer.Loading().image.id);
-		videoPlayer.DoThingIfImgClickEligible(e, function (camData)
+		if ((e.which === 2 || enabled3dPositioning || (e.getModifierState && e.getModifierState("Control"))))
 		{
-			currentCam = camData;
-		});
+			mouseCoordFixer.fix(e); // <- Doing this at the wrong time creates havoc when doing two-finger zooming on touchscreens.
+			currentCam = cameraListLoader.GetCameraWithId(videoPlayer.Loading().image.id);
+			videoPlayer.DoThingIfImgClickEligible(e, function (camData)
+			{
+				currentCam = camData;
+			});
 
-		if (!currentCam || !currentCam.ptz || !currentCam.ptzdirect)
-			return;
-		return (e.which === 2 || enabled3dPositioning ||
-			(e.getModifierState && e.getModifierState("Control")));
+			return !!(currentCam && currentCam.ptz && currentCam.ptzdirect);
+		}
+		return false;
 	}
 	function ImageArea_MouseDown(e)
 	{
-		mouseCoordFixer.fix(e);
 		if (pos3dDragging)
 		{
 			pos3dDragging = false;