aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspiff <spiff@xbmc.org>2011-04-30 19:43:17 +0200
committerspiff <spiff@xbmc.org>2011-04-30 21:21:57 +0200
commit451631665f3ad78eca046ee3d4fc4f10daeae612 (patch)
treea5113911002fdee5b4550a4e9da65039228fc7f1
parentf70236b1b52585f0456a97b1daaf4085a64736e1 (diff)
fixed: videos didn't work with 'start slideshow from here' context menu entry
we need to check for videos in OnShowPicture as well
-rw-r--r--xbmc/pictures/GUIWindowPictures.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/xbmc/pictures/GUIWindowPictures.cpp b/xbmc/pictures/GUIWindowPictures.cpp
index 663eaef849..ab48718cee 100644
--- 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());
}