Fix: Slots for clips only used when a clip is provided

cleitet · Oct 8, 2020 · 4114c98 · 4114c98
1 parent 2e27092
commit 4114c98
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/SwitcherLib/Upload.cs b/SwitcherLib/Upload.cs
@@ -44,8 +44,7 @@ public Upload(Switcher switcher, String path, uint uploadSlot)
             this.uploadSlot = uploadSlot;
             this.switcher.Connect();
             this.switcherMediaPool = (IBMDSwitcherMediaPool)this.switcher.GetSwitcher();
-            this.clip = this.GetClip();
-            this.stills = this.GetStills();
+
 
             // Is a directory of clips
             if (Directory.Exists(path))
@@ -68,6 +67,8 @@ public Upload(Switcher switcher, String path, uint uploadSlot)
                     throw new SwitcherLibException(String.Format("No bmp, jpg, jpeg, gif, png, tiff or tif files found in {0}", path));
                 Log.Debug(String.Format("Found {0} media files in {1}", this.framepaths.Length, path));
 
+                this.clip = this.GetClip();
+
 
                 UInt32 maxclips;
                 this.switcherMediaPool.GetFrameTotalForClips(out maxclips);
@@ -81,7 +82,8 @@ public Upload(Switcher switcher, String path, uint uploadSlot)
             else if (File.Exists(path))
             {
                 this.currentframepath = path;
-
+                this.stills = this.GetStills();
+
             }
             else
             {