Only chain to next tunnel if no instructions received. Pass through errors otherwise.

diff --git a/src/main/resources/tunnel.js b/src/main/resources/tunnel.js
index 835f9f5..3a0a481 100644 (file)
--- a/src/main/resources/tunnel.js
+++ b/src/main/resources/tunnel.js
@@ -674,7 +674,16 @@ Guacamole.ChainedTunnel = function() {
 
         // Wrap own oninstruction within current tunnel
         current_tunnel.oninstruction = function(opcode, elements) {
 
         // Wrap own oninstruction within current tunnel
         current_tunnel.oninstruction = function(opcode, elements) {

+            
+            // Invoke handler

             chained_tunnel.oninstruction(opcode, elements);
             chained_tunnel.oninstruction(opcode, elements);

+
+            // Use handler permanently from now on
+            current_tunnel.oninstruction = chained_tunnel.oninstruction;
+
+            // Pass through errors (without trying other tunnels)
+            current_tunnel.onerror = chained_tunnel.onerror;
+            

         }
 
         // Attach next tunnel on error
         }
 
         // Attach next tunnel on error