From 732796abe45c95b88d091b875f855e331b7839f2 Mon Sep 17 00:00:00 2001
From: nyamatongwe <nyamatongwe@gmail.com>
Date: Thu, 7 Feb 2013 13:36:17 +1100
Subject: Fix crash that can occur after running "Convert to Modern Objective-C
 Syntax" which leads to an NSArray that contains nil.

---
 cocoa/ScintillaCocoa.mm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'cocoa')

diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 7e9823762..36ddd9124 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -1351,10 +1351,10 @@ void ScintillaCocoa::SetPasteboardData(NSPasteboard* board, const SelectionText
                                                reinterpret_cast<const UInt8 *>(selectedText.s), 
                                                selectedText.len-1, encoding, false);
 
-  [board declareTypes:[NSArray arrayWithObjects:
-                       NSStringPboardType,
-                       selectedText.rectangular ? ScintillaRecPboardType : nil,
-                       nil] owner:nil];
+  NSArray *pbTypes = selectedText.rectangular ?
+    [NSArray arrayWithObjects: NSStringPboardType, ScintillaRecPboardType, nil] :
+    [NSArray arrayWithObjects: NSStringPboardType, nil];
+  [board declareTypes:pbTypes owner:nil];
   
   if (selectedText.rectangular)
   {
-- 
cgit v1.2.3