From 66d3973cdc1891a7d798cc9f76ef6465f06bac7f Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Sun, 11 Mar 2012 21:30:00 -0700
Subject: [PATCH] Fix reset() to properly reset EVERYTHING.

---
 guacamole-common-js/src/main/resources/layer.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/guacamole-common-js/src/main/resources/layer.js b/guacamole-common-js/src/main/resources/layer.js
index f78e519b4..c7754c3ee 100644
--- a/guacamole-common-js/src/main/resources/layer.js
+++ b/guacamole-common-js/src/main/resources/layer.js
@@ -72,6 +72,7 @@ Guacamole.Layer = function(width, height) {
      * @private
      */
     var displayContext = display.getContext("2d");
+    displayContext.save();
 
     /**
      * The queue of all pending Tasks. Tasks will be run in order, with new
@@ -89,6 +90,10 @@ Guacamole.Layer = function(width, height) {
 
     /**
      * The number of states on the state stack.
+     * 
+     * Note that there will ALWAYS be one element on the stack, but that
+     * element is not exposed. It is only used to reset the layer to its
+     * initial state.
      */
     var stackSize = 0;
 
@@ -788,16 +793,13 @@ Guacamole.Layer = function(width, height) {
 
             // Clear stack
             while (stackSize > 0) {
-                displaycontext.restore();
+                displayContext.restore();
                 stackSize--;
             }
 
-            // Clear transform
-            displayContext.setTransform(
-                1, 0, 0,
-                0, 1, 0
-              /*0, 0, 1*/
-            );
+            // Restore to initial state
+            displayContext.restore();
+            displayContext.save();
 
             // Clear path
             displayContext.beginPath();