Synchronize layers properly in copy.
authorMichael Jumper <zhangmaike@users.sourceforge.net>
Mon, 30 Jan 2012 08:53:13 +0000 (00:53 -0800)
committerMichael Jumper <zhangmaike@users.sourceforge.net>
Mon, 30 Jan 2012 08:53:13 +0000 (00:53 -0800)
src/main/resources/layer.js

index 64ee9a7..ee986a5 100644 (file)
@@ -246,8 +246,8 @@ Guacamole.Layer = function(width, height) {
     function scheduleTask(handler, blocked) {
         
         // If no pending tasks, just call (if available) and exit
-        if (layer.isReady() && !blocked && handler != null) {
-            handler();
+        if (layer.isReady() && !blocked) {
+            if (handler) handler();
             return null;
         }
 
@@ -382,10 +382,9 @@ Guacamole.Layer = function(width, height) {
      * 
      * @param {function} handler The function to call once all currently
      *                           pending operations are complete.
+     * @param {boolean} blocked Whether the task should start blocked.
      */
-    this.sync = function(handler) {
-        return scheduleTask(handler);
-    };
+    this.sync = scheduleTask;
 
     /**
      * Copy a rectangle of image data from one Layer to this Layer. This