crash fixes

spencersalazar · Dec 22, 2012 · 67973f6 · 67973f6
1 parent 061fbd1
commit 67973f6
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 3 deletions.
diff --git a/MAUI/miniAudicle_ui_elements_mac.mm b/MAUI/miniAudicle_ui_elements_mac.mm
@@ -195,6 +195,8 @@ - (void)setMasterView:(NSView *)v
                                      withObject:nil
                                   waitUntilDone:YES];
 
+    native_element = NULL;
+
     return TRUE;    
 }
 
@@ -307,8 +309,13 @@ - (void)hide
 
 - (void)destroy
 {
-    [panel close];
-    [panel release];
+    if(panel != nil)
+    {
+        [panel close];
+        [panel release];
+        panel = nil;
+    }
+
     [self autorelease];
 }
 
@@ -406,6 +413,8 @@ - (void)addElement:(mAUIElement *)e
                                   withObject:nil
                                waitUntilDone:YES];
 
+    native_view = NULL;
+
     return TRUE;
 }
 
@@ -437,7 +446,7 @@ - (void)addElement:(mAUIElement *)e
         if( elements[i] == e )
         {
             elements[i]->remove_parent( this );
-            elements[i] = NULL;
+            elements[i] = NULL; // SPENCERTODO: why not use list<> and remove?
         }
     }
 

diff --git a/MAUI/test/memleak.ck b/MAUI/test/memleak.ck
@@ -0,0 +1,12 @@
+
+while(true)
+{
+    MAUI_View myWinder;
+    MAUI_Button butt;
+    butt.name("BUTT!");
+    myWinder.addElement(butt);
+    myWinder.display();
+    0.25 :: second => now;
+    myWinder.destroy();
+    0.25 :: second => now;
+}
diff --git a/MAUI/test/perry1.ck b/MAUI/test/perry1.ck
@@ -0,0 +1,9 @@
+MAUI_View myWinder;
+MAUI_Button butt;
+butt.name("BUTT!");
+myWinder.addElement(butt);
+myWinder.display();
+while (butt.state()==0)  {
+    0.01 :: second => now;
+}
+myWinder.destroy();
diff --git a/MAUI/test/perry2.ck b/MAUI/test/perry2.ck
@@ -0,0 +1,9 @@
+
+MAUI_View view;
+MAUI_Button butt;
+butt.name("Butt");
+view.addElement(butt);
+view.display;
+1.0 :: second => now;
+view.destroy;
+