Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

[Fix] Do not show thumb of video when playing slideshow. #2942

Closed
wants to merge 1 commit into from

2 participants

@ulion
Collaborator

Fix video thumb which should not be displayed when playing slideshow, problem described in #2580 (comment)

@MartijnKaijser

I think it's not supposed to be a branch in xbmc repo ;) not that it makes any difference

@ulion
Collaborator

ah, miss-action, my mistake.

@ulion ulion closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 6 additions and 2 deletions.
  1. +6 −2 xbmc/pictures/GUIWindowSlideShow.cpp
View
8 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())
Something went wrong with that request. Please try again.