From d4899f102fc4a5bd60e98de090d2bb61b3aac337 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Wed, 2 Mar 2022 17:32:58 +0000
Subject: [PATCH] GUACAMOLE-462: Clear out pending display operations and fully
 reset when importing state.

---
 guacamole-common-js/src/main/webapp/modules/Client.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/guacamole-common-js/src/main/webapp/modules/Client.js b/guacamole-common-js/src/main/webapp/modules/Client.js
index 866714162..83d89abaa 100644
--- a/guacamole-common-js/src/main/webapp/modules/Client.js
+++ b/guacamole-common-js/src/main/webapp/modules/Client.js
@@ -228,11 +228,14 @@ Guacamole.Client = function(tunnel) {
         currentState = state.currentState;
         currentTimestamp = state.currentTimestamp;
 
+        // Cancel any pending display operations/frames
+        display.cancel();
+
         // Dispose of all layers
         for (key in layers) {
             index = parseInt(key);
             if (index > 0)
-                display.dispose(layers[key]);
+                layers[key].dispose();
         }
 
         layers = {};