From df1dce9b2a8a5f6b9ff8da1f66ec044b8c628448 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Mon, 20 Aug 2007 19:49:36 +0000 Subject: [PATCH] if there is no error message but an error, simply state "Error", and small change with a mutable status string --- macosx/Torrent.m | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/macosx/Torrent.m b/macosx/Torrent.m index 9d0107d1e..b7999b19d 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -419,11 +419,16 @@ static int static_lastid = 0; //create strings for error or stalled if (fError) - [statusString setString: [NSLocalizedString(@"Error: ", "Torrent -> status string") + { + NSString * errorString = [self errorMessage]; + if (!errorString || [errorString isEqualToString: @""]) + [statusString setString: NSLocalizedString(@"Error", "Torrent -> status string")]; + else + [statusString setString: [NSLocalizedString(@"Error: ", "Torrent -> status string") stringByAppendingString: [self errorMessage]]]; + } else if (fStalled) - [statusString setString: [NSLocalizedString(@"Stalled, ", "Torrent -> status string") - stringByAppendingString: statusString]]; + [statusString insertString: NSLocalizedString(@"Stalled, ", "Torrent -> status string") atIndex: 0]; else; //update queue for checking (from downloading to seeding), stalled, or error