]> granicus.if.org Git - handbrake/commitdiff
MacGui: fix an exception in the preview window touchbar.
authorDamiano Galassi <damiog@gmail.com>
Sun, 18 Nov 2018 09:39:43 +0000 (10:39 +0100)
committerDamiano Galassi <damiog@gmail.com>
Sun, 18 Nov 2018 09:39:43 +0000 (10:39 +0100)
macosx/HBPictureHUDController.m

index bcd17f613792489506e0d7ed830cd152be6c4263..9cc0fe591558913d0cc44db38c19f34340e0a324 100644 (file)
     _generator = generator;
     NSUInteger imagesCount = generator.imagesCount;
 
-    self.slider.numberOfTickMarks = imagesCount;
-    self.slider.maxValue = imagesCount - 1;
-
-    if (self.selectedIndex > imagesCount)
+    if (imagesCount > 0)
     {
-        self.selectedIndex = imagesCount - 1;
+        self.slider.numberOfTickMarks = imagesCount;
+        self.slider.maxValue = imagesCount - 1;
+
+        if (self.selectedIndex > imagesCount)
+        {
+            self.selectedIndex = imagesCount - 1;
+        }
     }
 
     if (@available(macOS 10.12.2, *))
@@ -319,7 +322,10 @@ static NSTouchBarItemIdentifier HBTouchBarFitToScreen = @"fr.handbrake.fitToScre
 {
     NSScrubber *scrubber = (NSScrubber *)[[self.touchBar itemForIdentifier:HBTouchBarScrubber] view];
     [scrubber reloadData];
-    scrubber.animator.selectedIndex = self.selectedIndex;
+    if (self.selectedIndex < scrubber.numberOfItems)
+    {
+        scrubber.animator.selectedIndex = self.selectedIndex;
+    }
 }
 
 - (void)_touchBar_updateScrubberSelectedIndex:(NSUInteger)selectedIndex