Merge pull request #1104 from marekdedic/enter-handling-fix

Fixed race conditions
marekdedic · Sep 25, 2024 · f55e551 · f55e551
2 parents 343e1a3 + 764a7b3
commit f55e551
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/lib/State.ts b/src/lib/State.ts
@@ -140,10 +140,10 @@ export function State(
     transitionDirection: TransitionDirection,
   ): void {
     const newImageView = ImageView(targetImages[newIndex], options, videoCache);
+    currentImage = newIndex;
+    currentImageView = newImageView;
     newImageView.startLoading(
       () => {
-        currentImage = newIndex;
-        currentImageView = newImageView;
         addNewImage(transitionDirection);
       },
       () => {
@@ -241,6 +241,9 @@ export function State(
   }
 
   function open(index: number, skipHistory = false): void {
+    if (currentImage !== null) {
+      return;
+    }
     addContainerToDOM(options.animationSpeed, options.quitOnDocClick, close);
     if (options.activity) {
       addActivityIndicatorToDOM();