Fix a bug where old view controllers and tab bar items were not remov…

…ed properly when setting new ones.
robbdimitrov · Dec 11, 2014 · 7e538f2 · 7e538f2
1 parent 145246a
commit 7e538f2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/RDVTabBarController/RDVTabBar.m b/RDVTabBarController/RDVTabBar.m
@@ -99,12 +99,12 @@ - (void)setItemWidth:(CGFloat)itemWidth {
 }
 
 - (void)setItems:(NSArray *)items {
-    for (RDVTabBarItem *item in items) {
+    for (RDVTabBarItem *item in _items) {
         [item removeFromSuperview];
     }
 
     _items = [items copy];
-    for (RDVTabBarItem *item in items) {
+    for (RDVTabBarItem *item in _items) {
         [item addTarget:self action:@selector(tabBarItemWasSelected:) forControlEvents:UIControlEventTouchDown];
         [self addSubview:item];
     }

diff --git a/RDVTabBarController/RDVTabBarController.m b/RDVTabBarController/RDVTabBarController.m
@@ -123,6 +123,14 @@ - (void)setSelectedIndex:(NSUInteger)selectedIndex {
 }
 
 - (void)setViewControllers:(NSArray *)viewControllers {
+    if (_viewControllers && _viewControllers.count) {
+        for (UIViewController *viewController in _viewControllers) {
+            [viewController willMoveToParentViewController:nil];
+            [viewController.view removeFromSuperview];
+            [viewController removeFromParentViewController];
+        }
+    }
+
     if (viewControllers && [viewControllers isKindOfClass:[NSArray class]]) {
         _viewControllers = [viewControllers copy];