banshee r4200 - in trunk/banshee: . src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio

[blorentz svn gnome org]

Author: blorentz
Date: Wed Jun 25 17:48:35 2008
New Revision: 4200
URL: http://svn.gnome.org/viewvc/banshee?rev=4200&view=rev

Log:
* src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs:
  Fix bug where the repeat and shuffle mode were restored when
  switching between two Last.fm stations (BGO #538946).

Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs

Modified: trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmActions.cs	Wed Jun 25 17:48:35 2008
@@ -440,14 +440,16 @@
             PlaybackRepeatActions repeat_actions = Actions.PlaybackActions.RepeatActions;
             PlaybackShuffleActions shuffle_actions = Actions.PlaybackActions.ShuffleActions;
 
-            // Save/clear or restore shuffle/repeat values when we first switch to a Last.fm station
+            // Save/clear shuffle/repeat values when we first switch to a Last.fm station
             if (is_lastfm && !was_lastfm) {
                 old_repeat = repeat_actions.Active;
                 repeat_actions.Active = repeat_actions["RepeatNoneAction"] as RadioAction;
                 
                 old_shuffle = shuffle_actions.Active;
                 shuffle_actions.Active = shuffle_actions["ShuffleOffAction"] as RadioAction;
-            } else {
+            }
+            // Restore shuffle/repeat values when we switch from a Last.fm station to a non Last.fm source
+            if (!is_lastfm && was_lastfm) {
                 RestoreShuffleRepeat ();
             }