made sure CPViewController calls viewDidLoad if it's view property is set directly

This commit is contained in:
Klaas Pieter Annema
2010-08-12 22:47:59 -04:00
committed by Alexander Ljungberg
parent ba33bb56d0
commit 1a9670ae9c
+6 -2
View File
@@ -162,8 +162,6 @@ var CPViewControllerCachedCibs;
if ([cibOwner respondsToSelector:@selector(viewControllerDidLoadCib:)])
[cibOwner viewControllerDidLoadCib:self];
[self viewDidLoad];
}
return _view;
@@ -189,7 +187,13 @@ var CPViewControllerCachedCibs;
*/
- (void)setView:(CPView)aView
{
var viewWasLoaded = !_view;
_view = aView;
// Make sure the viewDidLoad method is called if the view is set directly
if (viewWasLoaded)
[self viewDidLoad];
}
@end