From 2f86c0d9d27f263c789baea48e5b50208e15639a Mon Sep 17 00:00:00 2001
From: Francisco Ryan Tolmasky I <francisco@280north.com>
Date: Mon, 10 Jan 2011 09:21:46 -0800
Subject: [PATCH] Slight initWithArray:shouldCopyItems: fix.

Reviewed by me.
---
 Foundation/CPArray/_CPJavaScriptArray.j | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Foundation/CPArray/_CPJavaScriptArray.j b/Foundation/CPArray/_CPJavaScriptArray.j
index 6785d8b14..011940f56 100644
--- a/Foundation/CPArray/_CPJavaScriptArray.j
+++ b/Foundation/CPArray/_CPJavaScriptArray.j
@@ -49,13 +49,14 @@ var indexOf = Array.prototype.indexOf,
 
     if (anArray.isa === _CPJavaScriptArray)
     {
+        // If we're this far, shouldCopyItems must be YES.
         var count = anArray.length;
 
         for (; index < count; ++index)
         {
             var object = anArray[index];
 
-            self[index] = object.isa ? [object copy] : object;
+            self[index] = (object && object.isa) ? [object copy] : object;
         }
 
         return self;
@@ -67,7 +68,7 @@ var indexOf = Array.prototype.indexOf,
     {
         var object = [anArray objectAtIndex:index];
 
-        self[index] = object.isa ? [object copy] : object;
+        self[index] = (shouldCopyItems && object && object.isa) ? [object copy] : object;
     }
 
     return self;