From 68006adca4fc2026acdbf9f60d1f6ce6825538ae Mon Sep 17 00:00:00 2001
From: Chinh Nguyen <unknown>
Date: Thu, 16 Feb 2017 08:07:05 +1100
Subject: Bug [#1909]. Fix finalization crash on Cocoa.

---
 cocoa/ScintillaCocoa.mm   | 3 ++-
 doc/ScintillaHistory.html | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 7d11f9ca4..0af70fa7d 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -388,7 +388,8 @@ const CGFloat paddingHighlightY = 2;
 - (void) idleTriggered: (NSNotification*) notification
 {
 #pragma unused(notification)
-  static_cast<ScintillaCocoa*>(mTarget)->IdleTimerFired();
+  if (mTarget)
+    static_cast<ScintillaCocoa*>(mTarget)->IdleTimerFired();
 }
 
 @end
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index e2cf9a709..74137e479 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -561,6 +561,10 @@
 	<a href="http://sourceforge.net/p/scintilla/bugs/1896/">Bug #1896</a>.
 	</li>
 	<li>
+	Fix finalization crash on Cocoa.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1909/">Bug #1909</a>.
+	</li>
+	<li>
 	SciTE on GTK+ can have a wide divider between the panes with the
 	split.wide property.
 	</li>
-- 
cgit v1.2.3