Merge pull request #6654 from pec1985/TIMOB-17367

[TIMOB-17367] iOS - avoid left and right nav buttons on window to get GC'ed
tidev · Feb 20, 2015 · b7b6215 · b7b6215
2 parents 1bae1a7 + 180926c
commit b7b6215
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/iphone/Classes/TiUIWindowProxy.m b/iphone/Classes/TiUIWindowProxy.m
@@ -536,9 +536,15 @@ -(void)setRightNavButtons:(id)arg withObject:(id)properties
     for (TiViewProxy* curProxy in curValues) {
         if (![(NSArray*)arg containsObject:curProxy]) {
             [curProxy removeBarButtonView];
+            [self forgetProxy:curProxy];
         }
     }
-
+    for(TiViewProxy* proxy in arg) {
+        if([proxy isKindOfClass:[TiViewProxy class]]) {
+            [self rememberProxy:proxy];
+        }
+    }
+
     [self replaceValue:arg forKey:@"rightNavButtons" notification:NO];
     [self replaceValue:properties forKey:@"rightNavSettings" notification:NO];
     TiThreadPerformOnMainThread(^{
@@ -600,9 +606,14 @@ -(void)setLeftNavButtons:(id)arg withObject:(id)properties
     for (TiViewProxy* curProxy in curValues) {
         if (![(NSArray*)arg containsObject:curProxy]) {
             [curProxy removeBarButtonView];
+            [self forgetProxy:curProxy];
+        }
+    }
+    for(TiViewProxy* proxy in arg) {
+        if([proxy isKindOfClass:[TiViewProxy class]]) {
+            [self rememberProxy:proxy];
         }
     }
-
     [self replaceValue:arg forKey:@"leftNavButtons" notification:NO];
     [self replaceValue:properties forKey:@"leftNavSettings" notification:NO];
     TiThreadPerformOnMainThread(^{