# HG changeset patch
# User William Bowling <will@wbowling.info>
# Date 1257121327 -39600
# Node ID f3da0426c16a9274c37e443630eb683dada95010
# Parent  60b3a98aff775bd5dbe0a6e2ed8e480d8cf7c20b
# Parent  3b387703ca14cd2a247bf89c4ea0222f66aca2fd
Merge

diff -r 60b3a98aff775bd5dbe0a6e2ed8e480d8cf7c20b -r f3da0426c16a9274c37e443630eb683dada95010 Source/KNShelfSplitView.h
--- a/Source/KNShelfSplitView.h	Mon Nov 02 00:06:50 2009 +1100
+++ b/Source/KNShelfSplitView.h	Mon Nov 02 11:22:07 2009 +1100
@@ -65,6 +65,7 @@
 	BOOL						drawLine;
 	BOOL						shelfOnRight;
 	
+	NSString	*stringValue;
 	NSAttributedString *attributedStringValue;
 	CGFloat		stringHeight;
 	
diff -r 60b3a98aff775bd5dbe0a6e2ed8e480d8cf7c20b -r f3da0426c16a9274c37e443630eb683dada95010 Source/KNShelfSplitView.m
--- a/Source/KNShelfSplitView.m	Mon Nov 02 00:06:50 2009 +1100
+++ b/Source/KNShelfSplitView.m	Mon Nov 02 11:22:07 2009 +1100
@@ -710,9 +710,12 @@
 #pragma mark Status string
 - (void)setResizeThumbStringValue:(NSString *)inString
 {
-	if (attributedStringValue && ![inString isEqualToString:[attributedStringValue string]]) {		
+	if (![inString isEqualToString:stringValue]) {
+		[stringValue release];
+		stringValue = [inString copy];
+		
 		[attributedStringValue release];
-		if (inString) {
+		if (stringValue) {
 			NSDictionary *attributes = [NSDictionary dictionaryWithObjectsAndKeys:
 				[NSParagraphStyle styleWithAlignment:NSLeftTextAlignment
 									   lineBreakMode:NSLineBreakByTruncatingTail], NSParagraphStyleAttributeName,
@@ -720,7 +723,7 @@
 				nil];
 			
 			stringHeight = [NSAttributedString stringHeightForAttributes:attributes];
-			attributedStringValue = [[NSAttributedString alloc] initWithString:[inString retain]
+			attributedStringValue = [[NSAttributedString alloc] initWithString:stringValue
 																	attributes:attributes];
 		} else {
 			attributedStringValue = nil;