[Slim-Checkins] r33862 - in /7.7/trunk/server: Changelog7.html Slim/Buttons/Common.pm

Author: mherger
Date: Thu Feb 23 21:54:45 2012
New Revision: 33862

URL: http://svn.slimdevices.com/slim?rev=33862&view=rev
Log:
Fixed Bug: 17893
Description: when stopping playback don't push into playlist mode if already there

Modified:
    7.7/trunk/server/Changelog7.html
    7.7/trunk/server/Slim/Buttons/Common.pm

Modified: 7.7/trunk/server/Changelog7.html
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Changelog7.html?rev=33862&r1=33861&r2=33862&view=diff
==============================================================================
--- 7.7/trunk/server/Changelog7.html (original)
+++ 7.7/trunk/server/Changelog7.html Thu Feb 23 21:54:45 2012
@@ -22,6 +22,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17877">#17877</a> - Resume after underrun broken for synchronized (ip3k) players</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17881">#17881</a> - BMF scan corrupts dB replacing title with file name</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17882">#17882</a> - Fixed wrong MP4 MIME type for DLNA (audio/m4a was used instead of audio/mp4)</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17893">#17893</a> - Unnecessary push into current playlist when stopping playback</li>
 	</ul>
 	<br />
 </ul>

Modified: 7.7/trunk/server/Slim/Buttons/Common.pm
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/Buttons/Common.pm?rev=33862&r1=33861&r2=33862&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Buttons/Common.pm (original)
+++ 7.7/trunk/server/Slim/Buttons/Common.pm Thu Feb 23 21:54:45 2012
@@ -407,7 +407,10 @@
 
 			$client->execute(["stop"]);
 
-			Slim::Buttons::Common::pushMode($client, 'playlist');
+			# Push into playlist, unless already there 
+			if (Slim::Buttons::Common::mode($client) ne 'playlist') {
+				Slim::Buttons::Common::pushMode($client, 'playlist');
+			}
 
 			$client->showBriefly( {
 				'line' => [ "", $client->string('STOPPING') ],