fixed: JSONRPC *Playlist.Play fails to play the default track in the playlist; bad patch merge

Trac #9726

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@33107 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

2 files changed, 2 insertions, 2 deletions

diff --git a/xbmc/lib/libjsonrpc/AVPlayerOperations.cpp b/xbmc/lib/libjsonrpc/AVPlayerOperations.cpp
index f1fd3246f9..37a801517e 100644
--- a/xbmc/lib/libjsonrpc/AVPlayerOperations.cpp
+++ b/xbmc/lib/libjsonrpc/AVPlayerOperations.cpp
@@ -32,7 +32,7 @@ using namespace JSONRPC;
 JSON_STATUS CAVPlayerOperations::State(const CStdString &method, ITransportLayer *transport, IClient *client, const Value &parameterObject, Value &result)
 {
   if (!IsCorrectPlayer(method))
-    g_playlistPlayer.SetCurrentPlaylist(GetPlaylist(method));
+    return FailedToExecute;
 
   result["playing"] = g_application.IsPlaying();
   result["paused"] = g_application.IsPaused();
diff --git a/xbmc/lib/libjsonrpc/AVPlaylistOperations.cpp b/xbmc/lib/libjsonrpc/AVPlaylistOperations.cpp
index e4a6fb6997..11dad4ac48 100644
--- a/xbmc/lib/libjsonrpc/AVPlaylistOperations.cpp
+++ b/xbmc/lib/libjsonrpc/AVPlaylistOperations.cpp
@@ -35,7 +35,7 @@ using namespace std;
 JSON_STATUS CAVPlaylistOperations::Play(const CStdString &method, ITransportLayer *transport, IClient *client, const Value &parameterObject, Value &result)
 {
   if (g_playlistPlayer.GetCurrentPlaylist() != GetPlaylist(method))
-    return FailedToExecute;
+    g_playlistPlayer.SetCurrentPlaylist(GetPlaylist(method));
 
   if (parameterObject.isInt())
     g_application.getApplicationMessenger().PlayListPlayerPlay(parameterObject.asInt());