From 4d82718f43d92f2ef2193dc603a4486f85fb1582 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 7 May 2015 16:30:51 +0200 Subject: * Copying text from the query console without having a database selected could cause an exception (fixes #2111) * Text copied from the query console could have an invalid format in some setups --- Source/SPQueryController.m | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'Source') diff --git a/Source/SPQueryController.m b/Source/SPQueryController.m index 4aba3a14..c57621d8 100644 --- a/Source/SPQueryController.m +++ b/Source/SPQueryController.m @@ -171,20 +171,23 @@ static SPQueryController *sharedQueryController = nil; if (i < [messagesVisibleSet count]) { SPConsoleMessage *message = NSArrayObjectAtIndex(messagesVisibleSet, i); - if (includeTimestamps || includeConnections) [string appendString:@"/* "]; + if (includeTimestamps || includeConnections || includeDatabases) [string appendString:@"/* "]; - if (includeTimestamps) { - [string appendString:[dateFormatter stringFromDate:[message messageDate]]]; + NSDate *date = [message messageDate]; + if (includeTimestamps && date) { + [string appendString:[dateFormatter stringFromDate:date]]; [string appendString:@" "]; } - if (includeConnections) { - [string appendString:[message messageConnection]]; + NSString *connection = [message messageConnection]; + if (includeConnections && connection) { + [string appendString:connection]; [string appendString:@" "]; } - if (includeDatabases) { - [string appendString:[message messageDatabase]]; + NSString *database = [message messageDatabase]; + if (includeDatabases && database) { + [string appendString:database]; [string appendString:@" "]; } -- cgit v1.2.3