From c3de776c042b4af6109444f40cb43ea282a3eb97 Mon Sep 17 00:00:00 2001
From: Neil Hodgson <nyamatongwe@gmail.com>
Date: Wed, 1 Apr 2015 09:31:20 +1100
Subject: Bug [#1709]. Check whether pixmap is NULL before using to create
 bitmap.

---
 cocoa/ScintillaCocoa.mm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'cocoa')

diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 45637b28a..69a8a4c14 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -1446,7 +1446,8 @@ void ScintillaCocoa::StartDrag()
   if (pixmap)
   {
     CGImageRef imagePixmap = pixmap->GetImage();
-    bitmap = [[[NSBitmapImageRep alloc] initWithCGImage: imagePixmap] autorelease];
+    if (imagePixmap)
+      bitmap = [[[NSBitmapImageRep alloc] initWithCGImage: imagePixmap] autorelease];
     CGImageRelease(imagePixmap);
     pixmap->Release();
     delete pixmap;
-- 
cgit v1.2.3