From 9e81b116e66a0bff8ef8fe6b242f7f589f8f02ca Mon Sep 17 00:00:00 2001
From: Kent Sutherland <ksuther@ithinksw.com>
Date: Fri, 4 Jul 2003 04:17:42 +0000
Subject: [PATCH] I change some stuff over time, but I have no clue what it is
 anymore.

---
 MenuController.m        | 18 ++++++++++++------
 PreferencesController.m |  2 +-
 TODO.rtf                |  1 +
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/MenuController.m b/MenuController.m
index 96767ab..2ac4826 100755
--- a/MenuController.m
+++ b/MenuController.m
@@ -176,15 +176,21 @@
                 }
                 
                 if ([defaults boolForKey:@"showAlbum"]) {
-                    [menu addItemWithTitle:[NSString stringWithFormat:@"	 %@", [currentRemote currentSongAlbum]]
-                            action:nil
-                            keyEquivalent:@""];
+                    NSString *curAlbum = [currentRemote currentSongAlbum];
+                    if ([curAlbum length]) {
+                        [menu addItemWithTitle:[NSString stringWithFormat:@"	 %@", curAlbum]
+                                action:nil
+                                keyEquivalent:@""];
+                    }
                 }
                 
                 if ([defaults boolForKey:@"showArtist"]) {
-                    [menu addItemWithTitle:[NSString stringWithFormat:@"	 %@", [currentRemote currentSongArtist]]
-                            action:nil
-                            keyEquivalent:@""];
+                    NSString *curArtist = [currentRemote currentSongArtist];
+                    if ([curArtist length]) {
+                        [menu addItemWithTitle:[NSString stringWithFormat:@"	 %@", curArtist]
+                                action:nil
+                                keyEquivalent:@""];
+                    }
                 }
                 
                 if ([defaults boolForKey:@"showTrackNumber"]) {
diff --git a/PreferencesController.m b/PreferencesController.m
index 4281817..53e02bd 100755
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -630,7 +630,7 @@ static PreferencesController *prefs = nil;
     if ( flag ) {
         NSMutableDictionary *loginwindow;
         NSMutableArray *loginarray;
-        ComponentInstance temp = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);;
+        ComponentInstance temp = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
         int i;
         BOOL skip = NO;
 
diff --git a/TODO.rtf b/TODO.rtf
index 1c1fd4f..b7cf9b6 100755
--- a/TODO.rtf
+++ b/TODO.rtf
@@ -19,6 +19,7 @@ Space key equivalent needs to show up\
 \
 PreferencesController:\
 Do we want that preferences checkbox "Launch iTunes When MenuTunes Launches"? It isn't very pluginesque and I think our menu saying launch player is good enough.\
+If you change the number of upcoming songs, it doesn't change in the menu until the next menu rebuild.\
 \
 iTunesRemote:\
 -showPrimaryInterface doesn't show the browser window it and unminimize it\
-- 
2.20.1