From ec153d3ae871da7255b1e69f35255fa751835e36 Mon Sep 17 00:00:00 2001
From: vspader <unknown>
Date: Mon, 26 Feb 2007 05:26:48 +0000
Subject: [PATCH] Fixed defaults for launching LastFM.

---
 Application/AppController.m      |  3 ---
 Application/PlaybackController.h |  1 +
 Application/PlaybackController.m | 12 ++++++++++++
 AudioScrobbler/AudioScrobbler.m  |  5 ++++-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Application/AppController.m b/Application/AppController.m
index 1f5193324..91177bc4a 100644
--- a/Application/AppController.m
+++ b/Application/AppController.m
@@ -363,9 +363,6 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
 	[userDefaultsValuesDict setObject:[NSNumber numberWithBool:YES] forKey:@"remoteEnabled"];
 	[userDefaultsValuesDict setObject:[NSNumber numberWithBool:YES] forKey:@"remoteOnlyOnActive"];
 
-	[userDefaultsValuesDict setObject:[NSNumber numberWithBool:YES] forKey:@"enableAudioScrobbler"];
-	[userDefaultsValuesDict setObject:[NSNumber numberWithBool:YES] forKey:@"automaticallyLaunchLastFM"];
-
 	//Register and sync defaults
 	[[NSUserDefaults standardUserDefaults] registerDefaults:userDefaultsValuesDict];
 	[[NSUserDefaults standardUserDefaults] synchronize];
diff --git a/Application/PlaybackController.h b/Application/PlaybackController.h
index c7f140994..81843ee74 100644
--- a/Application/PlaybackController.h
+++ b/Application/PlaybackController.h
@@ -56,6 +56,7 @@
 - (IBAction)prev:(id)sender;
 - (IBAction)seek:(id)sender;
 
+- (void)initDefaults;
 
 - (void)updateTimeField:(double)pos;
 
diff --git a/Application/PlaybackController.m b/Application/PlaybackController.m
index 6a623c544..ab937c8e3 100644
--- a/Application/PlaybackController.m
+++ b/Application/PlaybackController.m
@@ -11,6 +11,8 @@
 	self = [super init];
 	if (self)
 	{
+		[self initDefaults];
+	
 		audioPlayer = [[AudioPlayer alloc] init];
 		[audioPlayer setDelegate:self];
 		playbackStatus = kCogStatusStopped;
@@ -23,6 +25,16 @@
 	return self;
 }
 
+- (void)initDefaults
+{
+	NSDictionary *defaultsDictionary = [NSDictionary dictionaryWithObjectsAndKeys:
+		[NSNumber numberWithBool:YES], @"enableAudioScrobbler",
+		[NSNumber numberWithBool:NO],  @"automaticallyLaunchLastFM",
+		nil];
+		
+	[[NSUserDefaults standardUserDefaults] registerDefaults:defaultsDictionary];
+}
+
 - (void)awakeFromNib
 {
 	currentVolume = 100.0;
diff --git a/AudioScrobbler/AudioScrobbler.m b/AudioScrobbler/AudioScrobbler.m
index a3c4e52ea..aad54bdea 100644
--- a/AudioScrobbler/AudioScrobbler.m
+++ b/AudioScrobbler/AudioScrobbler.m
@@ -64,7 +64,10 @@ escapeForLastFM(NSString *string)
 		_pluginID = @"tst";
 
 		if([[NSUserDefaults standardUserDefaults] boolForKey:@"automaticallyLaunchLastFM"]) {
-			[[NSWorkspace sharedWorkspace] launchApplication:@"Last.fm.app"];
+			NSLog(@"Launching client...");
+		}
+		else {
+			NSLog(@"NOT launching: %i", [[NSUserDefaults standardUserDefaults] boolForKey:@"automaticallyLaunchLastFM"]);
 		}
 		
 		_keepProcessingAudioScrobblerCommands = YES;