X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/9234efdd6caadd01f9b28637b44b7f88c42e0cec..8cd402b5d3e43c95046af7ac0e4cb3cde2d622bc:/MenuController.m

diff --git a/MenuController.m b/MenuController.m
index 382e6f2..7c418be 100755
--- a/MenuController.m
+++ b/MenuController.m
@@ -700,6 +700,15 @@
 			[tempItem setTag:p + [nextNode index] + 1];
 			[tempItem setTarget:self];
 		}
+		
+		PlaylistNode *root = node;
+		while ([root type] == ITMTPlaylistNode || [root type] == ITMTFolderNode) {
+			root = [root parent];
+		}
+		
+		if ([root index] == [[[MainController sharedController] currentRemote] currentSourceIndex] && [nextNode index] == _currentPlaylist) {
+			[tempItem setState:NSOnState];
+		}
 	}
 }
 
@@ -740,13 +749,13 @@
             if (source == ITMTRemoteRadioSource) {
                 [playlistsMenu addItem:[NSMenuItem separatorItem]];
                 [[playlistsMenu addItemWithTitle:NSLocalizedString(@"radio", @"Radio") action:@selector(performPlaylistMenuAction:) keyEquivalent:@""] setState:NSOnState];
-            }
-        } else {
-            [playlistsMenu addItem:[NSMenuItem separatorItem]];
+            } else if ([playlists count] > 2) {
+				[playlistsMenu addItem:[NSMenuItem separatorItem]];
+			}
         }
 		
 		//Add other sources as needed (shared music, iPods, CDs)
-        for (i = 2; i < [playlists count]; i++) {
+        for (i = [playlists count] - 1; i > 1 ; i--) {
             PlaylistNode *nextSource = [playlists objectAtIndex:i];
             if ([nextSource type] != ITMTRemoteRadioSource) {
                 NSString *name = [nextSource name];
@@ -765,15 +774,11 @@
             }
         }
     }
-    ITDebugLog(@"Checking the current source.");
 	NS_DURING
 	if (_currentPlaylist != -1) {
 		if ( (source == ITMTRemoteSharedLibrarySource) || (source == ITMTRemoteiPodSource) || (source == ITMTRemoteGenericDeviceSource) || (source == ITMTRemoteCDSource) ) {
 			tempItem = [playlistsMenu itemAtIndex:[playlistsMenu numberOfItems] + [indices indexOfObject:[NSNumber numberWithInt:[[[MainController sharedController] currentRemote] currentSourceIndex]]] - [indices count]];
 			[tempItem setState:NSOnState];
-			[[[tempItem submenu] itemAtIndex:_currentPlaylist - 1] setState:NSOnState];
-		} else if (source == ITMTRemoteLibrarySource && _currentPlaylist) {
-			[[playlistsMenu itemAtIndex:_currentPlaylist - 1] setState:NSOnState];
 		}
 	}
 	NS_HANDLER