From 0caa3b0161916ff9e51853a7f63d987f1a1301bf Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 1 Jan 2015 19:06:04 -0800 Subject: [PATCH] GUAC-963: Only send clipboard data it's a string. --- .../main/webapp/app/client/controllers/clientController.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guacamole/src/main/webapp/app/client/controllers/clientController.js b/guacamole/src/main/webapp/app/client/controllers/clientController.js index 63a35bdc8..a788cdccf 100644 --- a/guacamole/src/main/webapp/app/client/controllers/clientController.js +++ b/guacamole/src/main/webapp/app/client/controllers/clientController.js @@ -333,10 +333,10 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams }); - $scope.$watch('menuShown', function setKeyboardEnabled(menuShown, menuShownPreviousState) { + $scope.$watch('menuShown', function menuVisibilityChanged(menuShown, menuShownPreviousState) { // Send clipboard data if menu is hidden - if (!menuShown && menuShownPreviousState) + if (!menuShown && menuShownPreviousState && angular.isString($scope.client.clipboardData)) $scope.$broadcast('guacClipboard', 'text/plain', $scope.client.clipboardData); // Disable client keyboard if the menu is shown