From f9501d79d42bf4392c3b13e0e15e68a8e6280393 Mon Sep 17 00:00:00 2001
From: Kent Sutherland <ksuther@ithinksw.com>
Date: Sun, 8 Dec 2002 14:24:31 +0000
Subject: [PATCH] Fixed a bunch of bungs having to do with menu updating and
 playlist selection.

---
 English.lproj/Preferences.nib/objects.nib | Bin 10326 -> 10342 bytes
 MenuTunes.m                               |  84 +++++++++++-----------
 2 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/English.lproj/Preferences.nib/objects.nib b/English.lproj/Preferences.nib/objects.nib
index b5577cf99facc356661c359644d50f590437d573..c041fa6d6b5ba9aea5970648620bd2b4028e0d97 100755
GIT binary patch
literal 10342
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
W$63^|v0V#k^5!^{dPt*^<o^MZ&t%mA

literal 10326
zcmbVS4R93KeSfQOgoF?X7-HAH1Y(S3z<eYDVWShm1O+%g4&&A-h1K0k+H$&6?gL2;
z4Lq^8lhlokuVSskR3^k90YOE=q^j+f*fVq}Q%_T;({?gxI*c=xvZd3sOd665Mg9HX
z+q>O62|^5`-F^S}-v9mI|NH&lmCa1{_h{inGOnrJy!5Ar;x`OqRv_56aYy?fYN6yN
zHK}rT-7u;GK?z~$j2zOMN+e_561a5GDDl%&3=1aXdbCp+G?d19JL6i17T2O7Ezuf_
zCgZV4M2nkg(@^xMEjfH+Dw&K$nPJQb1f4NU4Wl9u+^cK7_?j6A?$#1Lv1nL}v%!pU
zDwEDKqsEVa9nL>V&-PSOZI5Uz@wnO#bd`ai{2a{AAc}!!kJgvmtZR|*!dEiGSvH);
zzk1Go!j;+ejL|bQoJrGvqf8Hl{7eBJqs}w2Rf|M67)A|nhmv|MO6__<Eq%3s3%Wi~
zrrcoz%+HunMpPO@Lyc|GP$U)Be90~?q51TvFO-UdElFQ8u7(Z*&=HGwtAw%1#FE(k
zX0U7CV0N)l{>9aw4ehI7jC}%scP803mSQ2MvoKTH=UE)jD84l;r*zaBN{EdpBW$G1
zOs7Fj6U3FyoH0s6em`vnTxpF(V&LRRg;6T0s|fZdl3KS3LTf@&N@9#@oF6GQN;*1@
zH9vN4L@}vdF?s>RW;?@(q3+O&3}Z|%Piab<8RKN0#}9G#_v_{`wr)<2zh@+C!AB{6
z;$HI`Zwwe<9eWcilm*mo%{-e<pBEdrWXwn;be-7g=j`tmmJDopa@QorF>@@9ZOzRg
zYU@@zwO}k24{4=PmZ2e1$X-1e>N25rW+q!i*LSC(>$`6V5ehmgTH;APk#s3}=aRer
z*jW0n2x;L~zqSus-B-9(FUsmYLgssP?*=bVhxVI!4%Ty};SuQQBY6!K9DH3;IzY-M
zxEAb+^}4jacY%#ugh0Mc;&74e2eK59rS6TaJ`sy{CP-P;@F5i@yxhfnWqQm{a%Ij#
z^BH?+eu1Dt=HQp^v<w_2GRMwBUiE=sAl2Qj#WxGRPipZpVWIgZ8#F3~w1xeYFM52@
zq9;f}E0)PmD7RtEff**@ZQ4^wEiBy*d5EDQ1!GI}Hbo)Bhmvj5g|({jem0n8P~`7t
z#^`~er2#cyzNM6AJ}`|cv0^9`!mLkVmKM^x)rcf?XG9HYU9pJpLU2Gz5Pz-gGM;T!
zM%fqF2KT{*_>c1Auu|^NFw^+gtnxR?Wp-KlUe&uLj2}P3`A>OxH~(-pKmK)op~p-U
zsmp0w%HyU2>v6RG>IEflYIBpYv5jyNo$**I8unP5;<d;bG)#7Whip)Y+_k_toc)@!
zD^N^&76`|ynhUq7sc5Lnw_S^-_N1a(!lx#Ekyxi5bwz)Ds;0u#q^lS5k~v&?5-W(e
z^rM-y>G)arfLHxk-#=ybyv>)lMA}o`?n>FID-B!FV}t+*2;pLn+D<{D3~dn=hK<wN
zvdje8qwOrqmEW(~<6~@(FJnuRgyA@w9;jL?4X3=Nrzg_yE`38Rtqhn0{z<Hb5a2`?
zC%BR0F@A<e+Blbe5I%a<TIr)3Abt4gE%3(?b_mZTJavev=W5}T$uDDy^cXIMRrf<-
zMJt(L#3k{jmqa2(((^x4&|kbC^kqTykjLNN@*szoBcvo`Wrh&$DM!d)y8KT<2Je;3
zIF0(n3SROESK4V5y>py5DqvrTt3pcPYHePEZ3sVXaEuILrRmDD)G^;+h!O`9HD@25
z%1mYl*ij}{6eFq;(;|8g^*5c$DCm7x_6qZ-xKDWjbwBk=rp!?cvV=hhi=LS>S2fbc
zOi<a;fxo6EoxDu#eu|m#s1_#_j5JNIkFBOTJHaS<K<bd=1-4g0gv;$kG+1S-JBkdc
ziV_yT9}GZzi&A{!?C7JEbqR+ksNABd@Guk(A0+3_DIAVL#}=QxpA6vKOjpYsUy{DS
zD2!h`w&C2lR~0ve*L8`N+z1Z0VPMIIm3RCimMH67U8}snetgknEK`X<Qu{vWuS}%c
zyWu6wSyi-w*?C&)b0HfG&zW0@vSzmy?v2I5zE(ZyF*Xl&v$W*LdDl0iGp>6b-mzxL
z3r-J949xL?8o_a?m<ne@TzQD(N$-q;&Pw_-%8BElJkt42>Qd}dN6j=LC&59Vq{eA+
z&i?5Yp;1SnQBvMnWu{n&o?;nLaR!8?Gm25#(b2??HGet#bE9T|IF`fG1gZFd`cnm{
zPMw18)d>x(D?;>-K=Q{g{_q2M44>E^SAMU7v)8$TZOeCN61yY4{bXj5)L)~V(qX;2
zdhXl-0|befKbiA`>@pBo4gz`$1cG*Cxy6YDXaBa$*Afo<bXaD>myA*7>LY>s+WURs
zxY~)B&{^0U(K?XNlBq4Pu3qNbt#!u^A=ecMypw>b+t(3~bqkzwmc$>|JG%-|s7U6c
zog#0Zy1E(_*mKnNh_gmq3nOBML@q7p*b?hqf*o|}2_KSdUzZl?X?8Vxu{V(^DRM34
znI#3zq$;!2<2{DJV`v-8EQJ&tMy9W&jq3Yz5W<XdZom+3V0tU^ns1Rod2O^YXQPe3
zm5r|SqI@8qaC@+kO+F}W&VO&4TLLaL(%(Nk?AX$$1OtywZ#y(xu#IeI390<2-}>(l
z@}@$p&&@0_m8tUzOr>EuLm?5Z&8(B6`hjaA6t3=?xsaQtOvoHbrzgPF{~JSyRaTk9
z=qTR-HIBPIX*X(BQ?A|YD2kse^S2{DY_HEW=k_~|z0E{=*}r0^no4L*u5z|`mGfjC
zCue`kl^V`o^pOI-=qtcnoY|BGVo^_E-{cAGB4H@Z8ggXQ66`-e-V$xU#S-s-yd?tn
zTEb=i1MqlpFh728=GQ&b6N+_{KMT@{$0LB?-334ly0-wBOf8E9u-8L6=@at7vm#}4
z$@X*hi~G@;08)ORI81s-e$Gp>i}O*={zU^TwBNuA6l@OZu~cFT-hI>KMfv0}4+HPv
zd*hwk>eM^r*|!b#4iC)-ytoVXoSpx8Yz|G&=HF!RRa;_7-&U<Z;j!#-nER|8-1lez
zRVmqPcGVA5LCQF0ienBEKUA8&nHhI%ABXk@9pFtzeP;X~wqNJq_Q{fxhc5@cd=Uxd
z&REYgJ+frN+50E+OZ9UFk~oSA5j_i*6S<{l9_5z2WTmL`k$0oqTfo>4;5&>K)UIe#
zZ$d4d6f$~=E62Ag0~K@_a!(rfpOt#fK2-EWewAC8E5E{lT@<_sggp(S^o9hSVWDc_
zV=3uQnBZ-B=1|7y&GZ?y7|_-xia|{}Mh*>CyQW}{4Y1ja4IG)AoMe=~&qnqxDwU`r
zin`F!K?_q*2otp;I(^ge4y(6zX`zGNYWyHlF5`#=PNEOfsc*a9M<oU|sUc0S-`_)W
zAkH~5Lj>!A5(xT!NEFQ~G^9eRzJg=Jz>lWPnKRW$?rYwxLjQG-IXHU?>Z;vv;~lM}
z3n)t)rMh1qcnaFkhoT7`t8=Q&*=5ddx8OYAGN(Y>yw!w?9X(XhbmJLk&kM7Z)jLo1
zEQdA(q|XBBvv)^Y*&6HaR-<7r))%J3>e}J&aCWB^cG!AvJFMOw3+o-a7WYN~&R+5w
zp@##?HW0fS#IC+OvE{)oy~9&HM8ZEEsa~w5!1^?>K7DtrV1X#5ds*=EG<ZMqI->-t
z_yLsW0`m*xl`G9v`DL_HTD(|KUQmAY@3NXSt>>JOZjFxrbT|T|KimaI@47dmYxW?~
z@6_VtXg%KUBbU+RFg~NtI@D)P*j8WEDf*!9PgRC0+7@T0okcr$adr$FqbGq2J*`1?
zM@E|)%lk9V&ba%+lvhc!U4)$3ZBEIk5M6O<Ro)uW)VP;luL&tQWh2*9%9@N}l%q-=
z>wD~!vl#Y*3I(;!I(sQ8;mYR~>;+E(JM1OivnH-=EvK%n<uqS*8I`i45JL6;O`O4H
z`TS=?rC5guLxth|Ov>7Y^}2i9m8%KmF%_1@C;-5VO({BYHtN}8LH<(6!q@L_fs!3t
zz5Kg$H{@P{*T=ZBlur71x}2D{9=-xzIDsOj@1WN2Lyp(3N5#QV92p%Y6eq*3SQ0~)
zQ)xk7IB+)Rsv|`x+=;bD)I=iKtM>G0@yF=GYY{nmDDlR4Obv%rT%yEHFB|UMX+S-&
zp`nOMuaBJRo$Jxiw*@E2QGPJ#u-SNv>eZ+!?N-BjOeO({R8D11fnsp>4WS@-OZ9Ne
zuk}I4Fbf4<eD1HtZhY{t?cVeZ7UJ>(^R4K(wPe!T)NCDSwys^ZLd{l9B?WfG%4hXx
zIM%yI>+XplR&wQ+g9z8UC`=%#qZFf*s9gEABzB;u4|+Q^G$X$%MPo$fooW=NPNV>3
z6#b#Zr_+j2Mp&@FvZK7@KSq>`oc%LrJd++Nxp?fzk;(rO5A%d|aNN3S!-1S7QiIKw
zGHF#RXrD&u+cG%&+Yglz&fewhSF)Hn@Pwpd9>sZC^@iHyt}Tfo+#$(*xg^<X<tO(+
z3mpEqwPC_~Zx{r8wa*&wvYIzoSBI^(X6yEZwRjR>Ncyz3ui0AOh{nt0`d%8ht_)j^
zODvnSYu2S<Yw|XrXK38;dVIZ2U!1*0ua;(fjY$A<<+EtLKsZj0TW5x?z0_;=S(k^c
zHH}u+gmt*jT0dbesI+boi$-bQ^<nFVZ3UXGcZkU6$F1j@vrk!B>>G)iRI@cJO>~_F
z2se{(EodG@12-#FKNMH0t4ym8pcx|5+(uVs)**?4*h;CAX)On!uqtX=Q3>-TsHU|<
z!rZbi*4qRa<lv~ibrntTjjm}OmXO?Pm_l{d{0-wu{4=c@fQl)&44Avq)uwe50NgIf
zr7#In0R*c#%vc5389<7*9|XvISG-EBr~nGz;n@pjS4w>Oy0mFgO~JYIHm!Hia47<3
z5e?;x-0lE70Z7eeJ))tywWAl+X&UxI!Az{Q001m6R+5Ei04D%+uTM<thHT620d<?V
zjq!`oF4`>A);kE3_Mr_2;3~w*mBc7GkLhN=1Rx0_uRa)hr5FaRjevP8_@-5`?i$mg
zTi`tBU?t9k9Acv2ZNTyZg@9o?fOxd21<j%j9ssClJETDG0bEQsj1AC2ZTzTs9QLwT
zj&k&hu)!k%Rt5Jbe6DG&L34_@;6wl}P>9<ANIfP8DXj~k9?(21ZlU4XB8(k?JQuL|
zb+lci;3WJAKwdszRKPomXkHJ1Br&(N*vK`2D;zHgOwXg4UktdPL%Yy8pd1uev0UzI
zO-n+}ks}51G59^IU!TrCOk)~wTdcS5NF^g0?l_}S{4OOH=j{6;Dx)V4s~;Ra0hdXn
z^ol@4rxvc%jh-Mqs_iBRpSugncabsHsF6rPk73Lci#n-xeg&+G--(RgBI_$p;LfZ`
z;#n|ygFqEX4kAcu#j*=VZxXCBByR2;AZU?NuRZ8UT?V@xp;CkMox-=~&_RZTuvQ{O
z*#L@@UkesVoikzwi#j%mISDOEhd!so=+M`e>!S0sQ%Q2V0@PJcvz&@hVRwkS8_?~X
zSw*ib>o^GZ<`Cpgr%rLr>4pu`fSM5H&;=BOLz~c3hYUiJD-9+uFY-=x(Hy}=ousaF
zd%PqU4WOV<m!w}{5Vb{}WTA6YPBl=_TR5PRNUjd!H&OB@COMiaPvGWTYz)LxXqqK{
zJJA+xk-wbCjXOcktA?)rM6ID6NqTM;#oJnyF2JXBQ8<{Tir=A3>7(FPFSbL!Cz;Ys
zHa;&RF7;cI+vp;H$`I+j>W~3LoAUlRM;Cf&&sAY9qIHVu2abbT4au+0m4^|RZ2aUS
zU@u;U_Y%&&hK%LXVSLZuX)7zyc=eF|+yVO#XWz1~ah3(-1<o#F08Y=pv~RBf;I%$9
zzrfio`^+BuBhKEkFaNF`4BJaSYv0<6u9ZlL?8eXGYt{^V{c^mQa`q>f_*KsS0<8_4
zox-aTP6w}LC|#p(khAaLh1Br^Ue_wngVX6Td&4$+@(DnY2cEZUp0q=8`_eP$+{oFm
zeHb|ozSm>Zc&*^<I7YsV9ohTZ0ocOX{{nD2iSI?gZC~f?=XM`w=j`Ff?aH+PKM=HU
zwAq{X+ij|y-D?Lz_Is#7W73rb9w$-Q#p`Up9p!8U!#@W?0T}%<9%Em@<9RdyU(Hzt
zE#!G$x37Q%`<-V2{WP|W*C#nk+Xp#&(_XL|&4wKqdH#>=iDh>4c6+a8ANZ2J{4@5=
zFQ9MXZag+Y3U(K64Q;#9zKR<wdz`a3(6J7e*Y*j;Ub7C3&Da=TPjU7NUVhI09B9v^
u?3O=3^D~_N8JaI~_U$b4<}9VtAnvc}Kr*{+V{0rFQ#Z$<*1a*Rp8Y?xf^I1Q

diff --git a/MenuTunes.m b/MenuTunes.m
index 727428c..74066d7 100755
--- a/MenuTunes.m
+++ b/MenuTunes.m
@@ -189,17 +189,13 @@ Things to do:
 //Updates the menu with current player state, song, and upcoming songs
 - (void)updateMenu
 {
-    NSString *curSongName, *curAlbumName;
+    NSString *curAlbumName = [self runScriptAndReturnResult:@"return album of current track"];
     NSMenuItem *menuItem;
     
     if ((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0)) {
         return;
     }
     
-    //Get the current track name and album.
-    curSongName = [self runScriptAndReturnResult:@"return name of current track"];
-    curAlbumName = [self runScriptAndReturnResult:@"return album of current track"];
-    
     if (upcomingSongsItem) {
         [self rebuildUpcomingSongsMenu];
     }
@@ -210,51 +206,55 @@ Things to do:
         [self rebuildEQPresetsMenu];
     }
     
-    if ([curSongName length] > 0) {
-        int index = [menu indexOfItemWithTitle:@"Now Playing"];
-        
-        if (index > -1) {
-            [menu removeItemAtIndex:index + 1];
+    if (trackInfoIndex > -1)
+    {
+        NSString *curSongName;
+        curSongName = [self runScriptAndReturnResult:@"return name of current track"];
+        if ([curSongName length] > 0) {
+            int index = [menu indexOfItemWithTitle:@"Now Playing"];
             
-            if (didHaveAlbumName) {
+            if (index > -1) {
                 [menu removeItemAtIndex:index + 1];
+                
+                if (didHaveAlbumName) {
+                    [menu removeItemAtIndex:index + 1];
+                }
             }
-        }
-        
-        if ([curAlbumName length] > 0) {
-            menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curAlbumName]
-                                                  action:nil
-                                                  keyEquivalent:@""];
+            
+            if ([curAlbumName length] > 0) {
+                menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curAlbumName]
+                                                    action:nil
+                                                    keyEquivalent:@""];
+                [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
+                [menuItem release];
+            }
+            
+            menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curSongName]
+                                                action:nil
+                                                keyEquivalent:@""];
             [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
             [menuItem release];
-        }
-        
-        menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curSongName]
-                                              action:nil
-                                              keyEquivalent:@""];
-        [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
-        [menuItem release];
-        
-        if (index == -1) {
-            menuItem = [[NSMenuItem alloc] initWithTitle:@"Now Playing" action:nil keyEquivalent:@""];
-            [menu removeItemAtIndex:[menu indexOfItemWithTitle:@"No Song"]];
+            
+            if (index == -1) {
+                menuItem = [[NSMenuItem alloc] initWithTitle:@"Now Playing" action:nil keyEquivalent:@""];
+                [menu removeItemAtIndex:[menu indexOfItemWithTitle:@"No Song"]];
+                [menu insertItem:menuItem atIndex:trackInfoIndex];
+                [menuItem release];
+            }
+            
+        } else if ([menu indexOfItemWithTitle:@"No Song"] == -1) {
+            [menu removeItemAtIndex:trackInfoIndex];
+            [menu removeItemAtIndex:trackInfoIndex];
+            
+            if (didHaveAlbumName) {
+                [menu removeItemAtIndex:trackInfoIndex];
+            }
+            
+            menuItem = [[NSMenuItem alloc] initWithTitle:@"No Song" action:nil keyEquivalent:@""];
             [menu insertItem:menuItem atIndex:trackInfoIndex];
             [menuItem release];
         }
-        
-    } else if ([menu indexOfItemWithTitle:@"No Song"] == -1) {
-        [menu removeItemAtIndex:trackInfoIndex];
-        [menu removeItemAtIndex:trackInfoIndex];
-        
-        if (didHaveAlbumName) {
-            [menu removeItemAtIndex:trackInfoIndex];
-        }
-        
-        menuItem = [[NSMenuItem alloc] initWithTitle:@"No Song" action:nil keyEquivalent:@""];
-        [menu insertItem:menuItem atIndex:trackInfoIndex];
-        [menuItem release];
     }
-    
     didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO);
 }
 
@@ -516,6 +516,8 @@ andEventID:(AEEventID)eventID
 - (void)selectPlaylist:(id)sender
 {
     int playlist = [[sender representedObject] intValue];
+    int curPlaylist = [[self runScriptAndReturnResult:@"return index of current playlist"] intValue];
+    [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOffState];
     [self runScriptAndReturnResult:[NSString stringWithFormat:@"play playlist %i", playlist]];
     [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState];
     [self updateMenu];
-- 
2.20.1