From: Kent Sutherland <ksuther@ithinksw.com>
Date: Wed, 11 Jun 2003 03:49:42 +0000 (+0000)
Subject: Fixed menu reordering crashing in preferences thingy yay.
X-Git-Tag: v1.0~96
X-Git-Url: http://git.ithinksw.org/MenuTunes.git/commitdiff_plain/3907f695946d40d54141f3d960d7578a8eb94575?ds=inline;hp=547eb3b6dd80973198a2d3eea7c1ab7631540086

Fixed menu reordering crashing in preferences thingy yay.
---

diff --git a/PreferencesController.m b/PreferencesController.m
index e1c47d1..4ad0f4f 100755
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -208,8 +208,8 @@ static PreferencesController *prefs = nil;
 
     [df setObject:[NSArray arrayWithObjects:
         @"playPause",
-        @"nextTrack",
         @"prevTrack",
+        @"nextTrack",
         @"fastForward",
         @"rewind",
         @"showPlayer",
@@ -762,17 +762,17 @@ static PreferencesController *prefs = nil;
         dragData = [pb stringForType:@"MenuTableViewPboardType"];
         dragRow = [dragData intValue];
         temp = [myItems objectAtIndex:dragRow];
-        [myItems removeObjectAtIndex:dragRow];
-        
         if (tableView == menuTableView) {
+            [myItems insertObject:temp atIndex:row];
             if (row > dragRow) {
-                [myItems insertObject:temp atIndex:row - 1];
+                [myItems removeObjectAtIndex:dragRow];
             } else {
-                [myItems insertObject:temp atIndex:row];
+                [myItems removeObjectAtIndex:dragRow + 1];
             }
         } else {
             if (![temp isEqualToString:@"separator"]) {
                 [availableItems addObject:temp];
+                [myItems removeObjectAtIndex:dragRow];
             }
         }
     } else if ([[pb types] containsObject:@"AllTableViewPboardType"]) {
@@ -780,10 +780,11 @@ static PreferencesController *prefs = nil;
         dragRow = [dragData intValue];
         temp = [availableItems objectAtIndex:dragRow];
         
+        [myItems insertObject:temp atIndex:row];
+        
         if (![temp isEqualToString:@"separator"]) {
             [availableItems removeObjectAtIndex:dragRow];
         }
-        [myItems insertObject:temp atIndex:row];
     }
     
     [menuTableView reloadData];
diff --git a/TODO.rtf b/TODO.rtf
index 70fdaca..ede8f24 100755
--- a/TODO.rtf
+++ b/TODO.rtf
@@ -22,7 +22,6 @@ 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.\
 May have some hotkey setting problems\
-Crashes when trying to reorder the menu\
 \
 iTunesRemote:\
 -showPrimaryInterface doesn't show the browser window it and unminimize it\