Fix #291

AntonyCorbett · Mar 13, 2020 · 1857af6 · 1857af6
1 parent 09b17ab
commit 1857af6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/OnlyM/Services/ImageDisplayManager.cs b/OnlyM/Services/ImageDisplayManager.cs
@@ -2,7 +2,6 @@
 {
     using System;
     using System.Collections.Generic;
-    using System.Diagnostics;
     using System.IO;
     using System.Linq;
     using System.Threading.Tasks;
@@ -422,7 +421,7 @@ private void InitFromSlideshowFile(string mediaItemFilePath)
                 return;
             }
 
-            sf.ExtractImages(_slideshowStagingFolder);
+            sf.ExtractImages(GetStagingFolderForSlideshow());
 
             _slides = sf.GetSlides(includeBitmapImage: false).ToList();
             _shouldLoopSlideshow = sf.Loop;
@@ -431,6 +430,13 @@ private void InitFromSlideshowFile(string mediaItemFilePath)
             _autoPlaySlideshowDwellTime = sf.DwellTimeMilliseconds;
         }
 
+        private string GetStagingFolderForSlideshow()
+        {
+            var folder = Path.Combine(_slideshowStagingFolder, _slideshowGuid.ToString("N"));
+            Directory.CreateDirectory(folder);
+            return folder;
+        }
+
         private void ConfigureSlideshowAutoPlayTimer()
         {
             if (_autoPlaySlideshow)
@@ -480,7 +486,7 @@ private void DisplaySlide(
 
             var fadeType = GetSlideFadeType(slide, previousSlide, direction);
 
-            var imageFilePath = Path.Combine(_slideshowStagingFolder, slide.ArchiveEntryName);
+            var imageFilePath = Path.Combine(GetStagingFolderForSlideshow(), slide.ArchiveEntryName);
 
             PlaceImage(
                 mediaItemId,

diff --git a/SolutionInfo.cs b/SolutionInfo.cs
@@ -6,4 +6,4 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("1.5.0.29")]
+[assembly: AssemblyVersion("1.5.0.30")]