Revision: 3386
http://skim-app.svn.sourceforge.net/skim-app/?rev=3386&view=rev
Author: hofman
Date: 2008-01-29 16:04:24 -0800 (Tue, 29 Jan 2008)
Log Message:
-----------
Check for non-nil before setting font.
Modified Paths:
--------------
trunk/SKNoteWindowController.m
trunk/SKPDFAnnotationNote.m
Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m 2008-01-26 18:00:45 UTC (rev 3385)
+++ trunk/SKNoteWindowController.m 2008-01-30 00:04:24 UTC (rev 3386)
@@ -95,7 +95,8 @@
if ([self isNoteType] && [[textView string] length] == 0) {
NSFont *font = [NSFont fontWithName:[[NSUserDefaults
standardUserDefaults] stringForKey:SKAnchoredNoteFontNameKey]
size:[[NSUserDefaults
standardUserDefaults] floatForKey:SKAnchoredNoteFontSizeKey]];
- [textView setFont:font];
+ if (font)
+ [textView setFont:font];
}
[self updateStatusMessage];
@@ -248,7 +249,8 @@
if ([key isEqualToString:SKAnchoredNoteFontNameKey] || [key
isEqualToString:SKAnchoredNoteFontSizeKey] && [self isNoteType] && [[textView
string] length] == 0) {
NSFont *font = [NSFont fontWithName:[[NSUserDefaults
standardUserDefaults] stringForKey:SKAnchoredNoteFontNameKey]
size:[[NSUserDefaults
standardUserDefaults] floatForKey:SKAnchoredNoteFontSizeKey]];
- [textView setFont:font];
+ if (font)
+ [textView setFont:font];
}
} else if (object == note) {
if ([keyPath isEqualToString:@"page"] || [keyPath
isEqualToString:@"bounds"])
Modified: trunk/SKPDFAnnotationNote.m
===================================================================
--- trunk/SKPDFAnnotationNote.m 2008-01-26 18:00:45 UTC (rev 3385)
+++ trunk/SKPDFAnnotationNote.m 2008-01-30 00:04:24 UTC (rev 3386)
@@ -1212,7 +1212,8 @@
[self setShouldPrint:YES];
NSFont *font = [NSFont fontWithName:[[NSUserDefaults
standardUserDefaults] stringForKey:SKTextNoteFontNameKey]
size:[[NSUserDefaults
standardUserDefaults] floatForKey:SKTextNoteFontSizeKey]];
- [super setFont:font];
+ if (font)
+ [super setFont:font];
originalSetColor(self, @selector(setColor:), [[NSUserDefaults
standardUserDefaults] colorForKey:SKFreeTextNoteColorKey]);
PDFBorder *border = [[PDFBorder allocWithZone:[self zone]] init];
[border setLineWidth:[[NSUserDefaults standardUserDefaults]
floatForKey:SKFreeTextNoteLineWidthKey]];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
