From fe44b55f10fb7f43a0994adbec29f4bb67c8405d Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Wed, 30 Jun 2021 20:02:16 -0700
Subject: [PATCH] GUACAMOLE-724: Always resolve promise from setClipboard() (as
 documented).

Returning a value from the callback provided to finally() is not
sufficient to force promise resolution.
---
 .../frontend/src/app/clipboard/services/clipboardService.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/guacamole/src/main/frontend/src/app/clipboard/services/clipboardService.js b/guacamole/src/main/frontend/src/app/clipboard/services/clipboardService.js
index 4ad9ee644..a7da73fcc 100644
--- a/guacamole/src/main/frontend/src/app/clipboard/services/clipboardService.js
+++ b/guacamole/src/main/frontend/src/app/clipboard/services/clipboardService.js
@@ -597,17 +597,13 @@ angular.module('clipboard').factory('clipboardService', ['$injector',
      *     set. This promise is always resolved.
      */
     service.setClipboard = function setClipboard(data) {
-        return setLocalClipboard(data).finally(() => {
+        return setLocalClipboard(data)['catch'](angular.noop).finally(() => {
 
             // Update internal clipboard and broadcast event notifying of
             // updated contents
             storedClipboardData(data);
             $rootScope.$broadcast('guacClipboard', data);
 
-            // Ensure promise is resolved (this function may be called from
-            // the promise rejection handler)
-            return data;
-
         });
     };