change(web): concurrency lock-management ordering

keymanapp · Feb 27, 2024 · b09a1ba · b09a1ba
1 parent 57079f3
commit b09a1ba
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/common/web/gesture-recognizer/src/engine/headless/gestures/matchers/matcherSelector.ts b/common/web/gesture-recognizer/src/engine/headless/gestures/matchers/matcherSelector.ts
@@ -246,11 +246,10 @@ export class MatcherSelector<Type, StateToken = any> extends EventEmitter<EventM
 
       await parentLockPromise;
 
-      childLock.resolve(); // allow the next matchGesture call through.
-
       if(this.pendingMatchSetup == childLock.corePromise) {
         this.pendingMatchSetup = null;
       }
+      childLock.resolve(); // allow the next matchGesture call through.
     }
 
     if(sourceNotYetStaged) {
@@ -334,12 +333,13 @@ export class MatcherSelector<Type, StateToken = any> extends EventEmitter<EventM
         // (which itself needs a macroqueue wait)
         await timedPromise(0);
 
-        matchingLock.resolve();
         // Only clear the promise if no extra entries were added to the implied `matchGesture` queue.
         if(this.pendingMatchSetup == matchingLock.corePromise) {
           this.pendingMatchSetup = null;
         }
 
+        matchingLock.resolve();
+
         // stateToken may have shifted by the time we regain control here.
         const incomingStateToken = this.stateToken;