Revision
75358
Author
ryandesign@macports.org
Date
2011-01-23 03:12:43 -0800 (Sun, 23 Jan 2011)

Log Message

Fix crash on launch when there isn't a preferences file; thanks to fyxa for reporting

Modified Paths

Diff

Modified: users/ryandesign/PCLauncher/LoginWindowController.m (75357 => 75358)


--- users/ryandesign/PCLauncher/LoginWindowController.m	2011-01-23 08:57:55 UTC (rev 75357)
+++ users/ryandesign/PCLauncher/LoginWindowController.m	2011-01-23 11:12:43 UTC (rev 75358)
@@ -101,18 +101,17 @@
 	[currentServer showStatusInField:serverStatusLabel];
 	
 	NSDictionary *login = [[[NSUserDefaults standardUserDefaults] dictionaryForKey:@"logins"] objectForKey:[currentServer internalName]];
-	NSString *username;
-	NSString *password;
+	NSString *username = nil;
+	NSString *password = nil;
 	if (login) {
 		username = [login objectForKey:@"username"];
 		password = [login objectForKey:@"password"];
 	} else if ([[currentServer internalName] isEqualToString:@"default"]) {
 		username = [[NSUserDefaults standardUserDefaults] objectForKey:@"username"];
 		password = [[NSUserDefaults standardUserDefaults] objectForKey:@"password"];
-	} else {
-		username = @"";
-		password = @"";
 	}
+	if (!username) username = @"";
+	if (!password) password = @"";
 	
 	[usernameField setStringValue:username];
 	[passwordField setStringValue:password];