Dont add more callbacks when disabled

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/callbacks/Callbacks.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/callbacks/Callbacks.java
index a91379ab037cd70f33b81638d202286b8dfc8716..0a34b5d593ab0bb8858115ba3284c5034496a023 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/callbacks/Callbacks.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/callbacks/Callbacks.java
@@ -119,8 +119,7 @@ public class Callbacks {
    * Disable a callback list from doing anything more.
    */
   public Callbacks disable() {
-    callbacks = JsObjectArray.create();
-    memory = null;
+    callbacks = memory = null;
     done = true;
     return this;
   }
@@ -152,13 +151,15 @@ public class Callbacks {
   }
   
   private void addAll(Object...o) {
-    for (Object c : o) {
-      if (!opts.getUnique() || !callbacks.contains(c)) {
-        callbacks.add(c);
-      }
-      // In jQuery add always is run when memory is true even when unique is set
-      if (opts.getMemory() && memory != null) {
-        run(c, memory.elements());
+    if (callbacks != null) {
+      for (Object c : o) {
+        if (!opts.getUnique() || !callbacks.contains(c)) {
+          callbacks.add(c);
+        }
+        // In jQuery add always is run when memory is true even when unique is set
+        if (opts.getMemory() && memory != null) {
+          run(c, memory.elements());
+        }
       }
     }
   }