From 09ec1dea0692e2c9298d9343a8e976e9d4e12b08 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Wed, 10 Feb 2021 13:10:57 -0800
Subject: [PATCH] GUACAMOLE-1204: Do not handle pinch gestures locally if the
 remote desktop is capable of handling pinch gestures.

---
 .../main/webapp/app/client/controllers/clientController.js   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/guacamole/src/main/webapp/app/client/controllers/clientController.js b/guacamole/src/main/webapp/app/client/controllers/clientController.js
index 451adeeb9..782167614 100644
--- a/guacamole/src/main/webapp/app/client/controllers/clientController.js
+++ b/guacamole/src/main/webapp/app/client/controllers/clientController.js
@@ -463,6 +463,11 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
     // Zoom and pan client via pinch gestures
     $scope.clientPinch = function clientPinch(inProgress, startLength, currentLength, centerX, centerY) {
 
+        // Do not handle pinch gestures if they would conflict with remote
+        // handling of similar gestures
+        if ($scope.client.multiTouchSupport > 1)
+            return false;
+
         // Do not handle pinch gestures while relative mouse is in use
         if (!$scope.client.clientProperties.emulateAbsoluteMouse)
             return false;