Skip to content
This repository
Browse code

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 authored September 30, 2013

Showing 1 changed file with 3 additions and 1 deletion. Show diff stats Hide diff stats

  1. 4  xbmc/pictures/SlideShowPicture.cpp
4  xbmc/pictures/SlideShowPicture.cpp
@@ -120,7 +120,9 @@ void CSlideShowPic::SetTexture_Internal(int iSlideNumber, CBaseTexture* pTexture
120 120
   m_transistionStart.type = transEffect;
121 121
   m_transistionStart.start = 0;
122 122
   // the +1's make sure it actually occurs
123  
-  float fadeTime = std::min(0.2f*CSettings::Get().GetInt("slideshow.staytime"), 3.0f);
  123
+  float fadeTime = 0.2f;
  124
+  if (m_displayEffect != EFFECT_NO_TIMEOUT)
  125
+    fadeTime = std::min(0.2f*CSettings::Get().GetInt("slideshow.staytime"), 3.0f);
124 126
   m_transistionStart.length = (int)(g_graphicsContext.GetFPS() * fadeTime); // transition time in frames
125 127
   m_transistionEnd.type = transEffect;
126 128
   m_transistionEnd.length = m_transistionStart.length;

0 notes on commit b727bbc

Please sign in to comment.
Something went wrong with that request. Please try again.