From 1a9670ae9cf755b8e2cb6a6950dfd8c5e197d413 Mon Sep 17 00:00:00 2001
From: Klaas Pieter Annema <klaaspieter@annema.me>
Date: Mon, 17 May 2010 12:32:56 +0200
Subject: [PATCH] made sure CPViewController calls viewDidLoad if it's view
 property is set directly

---
 AppKit/CPViewController.j | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/AppKit/CPViewController.j b/AppKit/CPViewController.j
index 3fffe261d..ab8c3a22e 100644
--- a/AppKit/CPViewController.j
+++ b/AppKit/CPViewController.j
@@ -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