fixed: videos didn't work with 'start slideshow from here' context menu entry

 we need to check for videos in OnShowPicture as well

diff --git a/xbmc/pictures/GUIWindowPictures.cpp b/xbmc/pictures/GUIWindowPictures.cpp
index 663eaef..ab48718 100644 (file)
--- a/xbmc/pictures/GUIWindowPictures.cpp
+++ b/xbmc/pictures/GUIWindowPictures.cpp
@@ -315,7 +315,10 @@ bool CGUIWindowPictures::ShowPicture(int iItem, bool startSlideShow)
   for (int i = 0; i < (int)m_vecItems->Size();++i)
   {
     CFileItemPtr pItem = m_vecItems->Get(i);
-    if (!pItem->m_bIsFolder && !(URIUtils::IsRAR(pItem->m_strPath) || URIUtils::IsZIP(pItem->m_strPath)) && pItem->IsPicture())
+    if (!pItem->m_bIsFolder && !(URIUtils::IsRAR(pItem->m_strPath) || 
+          URIUtils::IsZIP(pItem->m_strPath)) && (pItem->IsPicture() || (
+                                g_guiSettings.GetBool("pictures.showvideos") &&
+                                pItem->IsVideo())))
     {
       pSlideShow->Add(pItem.get());
     }