aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChinh Nguyen <unknown>2017-02-16 08:07:05 +1100
committerChinh Nguyen <unknown>2017-02-16 08:07:05 +1100
commit68006adca4fc2026acdbf9f60d1f6ce6825538ae (patch)
treeffa779ca1f935dcf2edac7abe9cf01aba9b9865d
parent990f3dd28013b356e822fd74c1f1de578f9eff09 (diff)
downloadscintilla-mirror-68006adca4fc2026acdbf9f60d1f6ce6825538ae.tar.gz
Bug [#1909]. Fix finalization crash on Cocoa.
-rw-r--r--cocoa/ScintillaCocoa.mm3
-rw-r--r--doc/ScintillaHistory.html4
2 files changed, 6 insertions, 1 deletions
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>