Merge pull request #1952 from jmarshallnz/onplayandqueuemedia

use CFileItem::IsSamePath() to match the item in OnPlayAndQueueMedia
xbmc · Dec 18, 2012 · 2f1fd18 · 2f1fd18
2 parents 704d364 + 57f6432
commit 2f1fd18
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/xbmc/video/windows/GUIWindowVideoBase.cpp b/xbmc/video/windows/GUIWindowVideoBase.cpp
@@ -1128,6 +1128,7 @@ bool CGUIWindowVideoBase::ShowPlaySelection(CFileItemPtr& item, const CStdString
     if(item_new->m_bIsFolder == false)
     {
       item.reset(new CFileItem(*item));
+      item->SetProperty("original_listitem_url", item->GetPath());
       item->SetPath(item_new->GetPath());
       return true;
     }

diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp
@@ -1415,7 +1415,7 @@ bool CGUIMediaWindow::OnPlayAndQueueMedia(const CFileItemPtr &item)
       if (!nItem->IsPlayList() && !nItem->IsZIP() && !nItem->IsRAR())
         g_playlistPlayer.Add(iPlaylist, nItem);
 
-      if (nItem == item)
+      if (item->IsSamePath(nItem.get()))
       { // item that was clicked
         mediaToPlay = g_playlistPlayer.GetPlaylist(iPlaylist).size() - 1;
       }