Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Closed
wants to merge 1 commit into from
Closed

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions xbmc/pictures/GUIWindowSlideShow.cpp
View file
Open in desktop
Expand Up @@ -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());
Expand Down Expand Up @@ -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())
Expand Down