From 1d5b47a70a2547b5d7f55c0cc28aeb5f79212384 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Fri, 4 Sep 2015 21:43:08 -0700
Subject: [PATCH] GUAC-1322: Within interpret_event() in Guacamole.Keyboard,
 always return the interpreted event (or null), as required by its definition.

---
 guacamole-common-js/src/main/webapp/modules/Keyboard.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/guacamole-common-js/src/main/webapp/modules/Keyboard.js b/guacamole-common-js/src/main/webapp/modules/Keyboard.js
index 9a93864cb..42617d6d5 100644
--- a/guacamole-common-js/src/main/webapp/modules/Keyboard.js
+++ b/guacamole-common-js/src/main/webapp/modules/Keyboard.js
@@ -933,13 +933,18 @@ Guacamole.Keyboard = function(element) {
         // Keyup event
         else if (first instanceof KeyupEvent) {
 
+            // Release specific key if known
             var keysym = first.keysym;
             if (keysym) {
                 guac_keyboard.release(keysym);
                 first.defaultPrevented = true;
             }
-            else
+
+            // Otherwise, fall back to releasing all keys
+            else {
                 guac_keyboard.reset();
+                return first;
+            }
 
             return eventLog.shift();