X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/547eb3b6dd80973198a2d3eea7c1ab7631540086..7eff668a73d0965a793c7956d9553f539ca30f65:/MenuController.m

diff --git a/MenuController.m b/MenuController.m
index 96767ab..f0a6e85 100755
--- a/MenuController.m
+++ b/MenuController.m
@@ -7,7 +7,7 @@
 //
 
 #import "MenuController.h"
-#import "NewMainController.h"
+#import "MainController.h"
 #import "HotKeyCenter.h"
 #import "KeyCombo.h"
 
@@ -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"]) {