Merge pull request #2040 from DerGenaue/patch-1

Fix secondsToZoom to work correctly for exact matches
OpenShot · Aug 30, 2018 · 962978a · 962978a
2 parents 407a111 + d600d16
commit 962978a
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/classes/conversion.py b/src/classes/conversion.py
@@ -39,13 +39,11 @@ def zoomToSeconds(zoomValue):
 
 def secondsToZoom(scaleValue):
     """ Convert a number of seconds to a timeline zoom factor """
-    if scaleValue in zoomSeconds:
-        return zoomSeconds[scaleValue]
-    else:
-        # Find closest zoom
-        closestValue = zoomSeconds[0]
-        for zoomValue in zoomSeconds:
-            if zoomValue < scaleValue:
-                closestValue = zoomValue
-        return zoomSeconds.index(closestValue)
+    # Find closest zoom or exact match
+    closestValue = zoomSeconds[0]
+    for zoomValue in zoomSeconds:
+        if zoomValue > scaleValue:
+            break;
+        closestValue = zoomValue
+    return zoomSeconds.index(closestValue)