diff options
| author | Memphiz <memphis@machzwo.de> | 2013-07-07 12:23:19 -0700 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2013-07-07 12:23:19 -0700 |
| commit | 44673bb15980b8164ec51e4fc849e3df42d55b14 (patch) | |
| tree | 67402286d5534a4765ab0ca6f7e22b544acd2ab7 | |
| parent | c66c354894d179a5c98b4afcead0bb790499dd63 (diff) | |
| parent | 0b649b962f6fdc2395bd2f8a5f9726f30398d4d0 (diff) | |
Merge pull request #2945 from ulion/do_not_show_video_thumb_when_playing_slideshow
[Fix] Do not show thumb of video when playing slideshow.
| -rw-r--r-- | xbmc/pictures/GUIWindowSlideShow.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xbmc/pictures/GUIWindowSlideShow.cpp b/xbmc/pictures/GUIWindowSlideShow.cpp index 1e7797c67d..761910d4d2 100644 --- a/xbmc/pictures/GUIWindowSlideShow.cpp +++ b/xbmc/pictures/GUIWindowSlideShow.cpp @@ -530,7 +530,7 @@ void CGUIWindowSlideShow::Process(unsigned int currentTime, CDirtyRegionList &re m_iLastFailedNextSlide = -1; CFileItemPtr item = m_slides->Get(m_iNextSlide); CStdString picturePath = GetPicturePath(item.get()); - if (!picturePath.IsEmpty()) + if (!picturePath.IsEmpty() && (!item->IsVideo() || !m_bSlideShow || m_bPause)) { if (item->IsVideo()) CLog::Log(LOGDEBUG, "Loading the thumb %s for next video %d: %s", picturePath.c_str(), m_iNextSlide, item->GetPath().c_str()); @@ -574,7 +574,11 @@ void CGUIWindowSlideShow::Process(unsigned int currentTime, CDirtyRegionList &re // render the next image if (m_Image[m_iCurrentPic].DrawNextImage()) { - if (m_Image[1 - m_iCurrentPic].IsLoaded()) + if (m_bSlideShow && !m_bPause && m_slides->Get(m_iNextSlide)->IsVideo()) + { + // do not show thumb of video when playing slideshow + } + else if (m_Image[1 - m_iCurrentPic].IsLoaded()) { // first time render the next image, make sure using current display effect. if (!m_Image[1 - m_iCurrentPic].IsStarted()) |