Skip to content

Commit

Permalink
Fixes issue in NoodleLineNumberView with ARC
Browse files Browse the repository at this point in the history
  • Loading branch information
henrik-w committed Dec 22, 2016
1 parent fd8db21 commit f86b4da
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions NoodleLineNumberView.m
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ - (void)dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver:self];

#if !__has_feature(objc_arc)
[_lineIndices release];
[_linesToMarkers release];
[_font release];
Expand All @@ -86,6 +87,7 @@ - (void)dealloc
[_backgroundColor release];

[super dealloc];
#endif
}

- (NSFont *)defaultFont
Expand Down Expand Up @@ -556,17 +558,17 @@ - (id)initWithCoder:(NSCoder *)decoder
{
if ([decoder allowsKeyedCoding])
{
_font = [[decoder decodeObjectForKey:NOODLE_FONT_CODING_KEY] retain];
_textColor = [[decoder decodeObjectForKey:NOODLE_TEXT_COLOR_CODING_KEY] retain];
_alternateTextColor = [[decoder decodeObjectForKey:NOODLE_ALT_TEXT_COLOR_CODING_KEY] retain];
_backgroundColor = [[decoder decodeObjectForKey:NOODLE_BACKGROUND_COLOR_CODING_KEY] retain];
[self setFont:[decoder decodeObjectForKey:NOODLE_FONT_CODING_KEY]];
[self setTextColor:[decoder decodeObjectForKey:NOODLE_TEXT_COLOR_CODING_KEY]];
[self setAlternateTextColor:[decoder decodeObjectForKey:NOODLE_ALT_TEXT_COLOR_CODING_KEY]];
[self setBackgroundColor:[decoder decodeObjectForKey:NOODLE_BACKGROUND_COLOR_CODING_KEY]];
}
else
{
_font = [[decoder decodeObject] retain];
_textColor = [[decoder decodeObject] retain];
_alternateTextColor = [[decoder decodeObject] retain];
_backgroundColor = [[decoder decodeObject] retain];
[self setFont:[decoder decodeObject]];
[self setTextColor:[decoder decodeObject]];
[self setAlternateTextColor:[decoder decodeObject]];
[self setBackgroundColor:[decoder decodeObject]];
}

_linesToMarkers = [[NSMutableDictionary alloc] init];
Expand Down

0 comments on commit f86b4da

Please sign in to comment.