Unregister disposed objects

ianharrigan · Jun 19, 2014 · 4277f03 · 4277f03
1 parent ba816b3
commit 4277f03
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/haxelib/haxeui.zip b/haxelib/haxeui.zip
diff --git a/src/haxe/ui/toolkit/console/HaxeUIConsoleFunctions.hx b/src/haxe/ui/toolkit/console/HaxeUIConsoleFunctions.hx
@@ -64,6 +64,7 @@ class HaxeUIConsoleFunctions {
 	public static function dispose(target:Dynamic):Void {
 		var c:Component = getComponent(target);
 		if (c != null) {
+			unregisterObjects(c);
 			c.parent.removeChild(c);
 		}
 	}
@@ -255,4 +256,18 @@ class HaxeUIConsoleFunctions {
 		HaxeUIConsole.scripts.set(scriptRes, scriptData);
 		DC.logConfirmation("Script '" + scriptRes + "' saved");
 	}
+
+	private static function unregisterObjects(parent:Component):Void {
+		if (parent == null) {
+			return;
+		}
+
+		if (parent.id != null) {
+			DC.unregisterObject(parent.id);
+		}
+
+		for (child in parent.children) {
+			unregisterObjects(cast child);
+		}
+	}
 }