Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #3238 from Memphiz/picturefade

[picture] - don't calculate a fadein/out based on the slideshow display ...
  • Loading branch information...
commit b727bbcc8ef601d3bd5ddd5b20c2fa7da5c5dfb7 2 parents 697e8b6 + 9cc68f1
@Memphiz Memphiz authored
Showing with 3 additions and 1 deletion.
  1. +3 −1 xbmc/pictures/SlideShowPicture.cpp
View
4 xbmc/pictures/SlideShowPicture.cpp
@@ -120,7 +120,9 @@ void CSlideShowPic::SetTexture_Internal(int iSlideNumber, CBaseTexture* pTexture
m_transistionStart.type = transEffect;
m_transistionStart.start = 0;
// the +1's make sure it actually occurs
- float fadeTime = std::min(0.2f*CSettings::Get().GetInt("slideshow.staytime"), 3.0f);
+ float fadeTime = 0.2f;
+ if (m_displayEffect != EFFECT_NO_TIMEOUT)
+ fadeTime = std::min(0.2f*CSettings::Get().GetInt("slideshow.staytime"), 3.0f);
m_transistionStart.length = (int)(g_graphicsContext.GetFPS() * fadeTime); // transition time in frames
m_transistionEnd.type = transEffect;
m_transistionEnd.length = m_transistionStart.length;
Please sign in to comment.
Something went wrong with that request. Please try again.