Browse files

Merge remote-tracking branch 'remotes/origin/BUG-4300-auto_shuffle_sl…

…ideshow_not_working_on_Recursive_Slideshow_when_only_subfolders_are_present'
  • Loading branch information...
2 parents fc3a7c9 + 88eefb2 commit 09ea5209a600e69d66b1d101b829fd97f1eca8f5 @Sebastiii Sebastiii committed Mar 30, 2013
Showing with 4 additions and 9 deletions.
  1. +4 −9 mediaportal/WindowPlugins/GUIPictures/GUISlideShow.cs
View
13 mediaportal/WindowPlugins/GUIPictures/GUISlideShow.cs
@@ -81,7 +81,10 @@ private SlidePicture LoadCurrentSlide()
_currentSlide = _slideCache.GetCurrentSlide(slideFilePath);
}
}
-
+ if (_autoShuffle)
+ {
+ Shuffle();
+ }
GUIPropertyManager.SetProperty("#selecteditem", Util.Utils.GetFilename(slideFilePath));
@@ -1172,10 +1175,6 @@ public void StartSlideShow()
{
LoadSettings();
_isBackgroundMusicPlaying = false;
- if (_autoShuffle)
- {
- Shuffle();
- }
_slideDirection = 1;
_isSlideShow = true;
}
@@ -1185,10 +1184,6 @@ public void StartSlideShow(string path)
LoadSettings();
_isBackgroundMusicPlaying = false;
StartBackgroundMusic(path);
- if (_autoShuffle)
- {
- Shuffle();
- }
_slideDirection = 1;
_isSlideShow = true;
}

0 comments on commit 09ea520

Please sign in to comment.