Index: Slim/Utils/Prefs.pm
===================================================================
--- Slim/Utils/Prefs.pm	(revision 4418)
+++ Slim/Utils/Prefs.pm	(working copy)
@@ -158,6 +158,7 @@
 		'upgrade-6.2b1-script'	=> 1,
 		'upgrade-6.2b1-2005-09-19-script' => 1,
 		'rank-PLUGIN_PICKS_MODULE_NAME' => 4,
+		'disableChangeNowPlayingMode' => 0,
 	);
 
 	# The following hash contains functions that are executed when the pref corresponding to
Index: Slim/Player/Client.pm
===================================================================
--- Slim/Player/Client.pm	(revision 4418)
+++ Slim/Player/Client.pm	(working copy)
@@ -588,6 +588,7 @@
 		,'shuffle'				=> 0
 		,'titleFormat'			=> [5, 1, 3, 6]
 		,'titleFormatCurr'		=> 1
+		,'disableChangeNowPlayingMode'	=> undef
 	};
 
 # Do this once for speed.
Index: Slim/Buttons/Playlist.pm
===================================================================
--- Slim/Buttons/Playlist.pm	(revision 4418)
+++ Slim/Buttons/Playlist.pm	(working copy)
@@ -40,7 +40,9 @@
 				# 3 show progress bar
 				# 4 show elapsed time and progress bar
 				# 5 show remaining time and progress bar
-				if (($playlistlen > 0) && (showingNowPlaying($client))) {
+				if (! $client->prefGet('disableChangeNowPlayingMode')
+					&& ($playlistlen > 0) && (showingNowPlaying($client))) {
 					$pdm = ($pdm + 1) % $client->nowPlayingModes();
 				} elsif ($playlistlen > 0) {
 					browseplaylistindex($client,Slim::Player::Source::playingSongIndex($client));