adium 3854:2a006bee65bd: Fix a crash that could occur on opening...

commits at adium.im commits at adium.im
Sat Apr 9 23:39:43 UTC 2011


details:	http://hg.adium.im/adium/rev/2a006bee65bd
revision:	3854:2a006bee65bd
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Sat Apr 09 19:37:58 2011 -0400

Fix a crash that could occur on opening the Transcript viewer due to two threads being spawned to display a log. Fixes #15049 as well as making logs load a bit faster when cycling through the table.
Subject: adium 3855:eaa9084115ca: Scroll to the top when a new log is selected.

details:	http://hg.adium.im/adium/rev/eaa9084115ca
revision:	3855:eaa9084115ca
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Sat Apr 09 19:38:04 2011 -0400

Scroll to the top when a new log is selected.

diffs (34 lines):

diff -r 1231cdf32f6d -r eaa9084115ca Source/AILogViewerWindowController.m
--- a/Source/AILogViewerWindowController.m	Sat Apr 09 14:28:42 2011 -0700
+++ b/Source/AILogViewerWindowController.m	Sat Apr 09 19:38:04 2011 -0400
@@ -740,6 +740,9 @@
 	NSString	 *logBasePath = [AILoggerPlugin logBasePath];
 	AILog(@"Displaying %@",logArray);
 	for (theLog in logArray) {
+		if ([thisOperation isCancelled])
+			break;
+		
 		NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 		
 		if (displayText) {
@@ -838,7 +841,7 @@
 	[matches release];
 	matches = [[NSMutableArray alloc] init];
 	
-	if (displayText && [displayText length]) {
+	if (displayText && [displayText length] && ![thisOperation isCancelled]) {
 		//Add pretty formatting to links
 		[displayText addFormattingForLinks];
 
@@ -1098,8 +1101,10 @@
 
 - (void)hilightNextPrevious
 {
-	if (currentMatch < 0 || [matches count] == 0)
+	if (currentMatch < 0 || [matches count] == 0) {
+		[textView_content scrollRangeToVisible:NSMakeRange(0,0)];
 		return;
+	}
 
 	//loop around matches in the displayed log
 	if (currentMatch > [matches count])




More information about the commits mailing list