Merge pull request #80 from clinuxrulz/collect-cycles-performance

reduced how often collect cycles is called
SodiumFRP · Mar 18, 2019 · bd14e2b · bd14e2b
2 parents 16b1b1c + 00a7260
commit bd14e2b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/lib/sodium/Transaction.ts b/src/lib/sodium/Transaction.ts
@@ -51,7 +51,7 @@ export class Transaction
   private sampleQ: Array<() => void> = [];
   private lastQ: Array<() => void> = [];
   private postQ: Array<() => void> = null;
-  private collectCyclesAtEnd: boolean = false;
+  private static collectCyclesAtEnd: boolean = false;
 
   prioritized(target: Vertex, action: () => void): void
   {
@@ -72,7 +72,7 @@ export class Transaction
 
   public static _collectCyclesAtEnd(): void
   {
-    Transaction.run(() => Transaction.currentTransaction.collectCyclesAtEnd = true);
+    Transaction.run(() => Transaction.collectCyclesAtEnd = true);
   }
 
   /**
@@ -178,10 +178,6 @@ export class Transaction
       }
       this.postQ = null;
     }
-    if (this.collectCyclesAtEnd) {
-      Vertex.collectCycles();
-      this.collectCyclesAtEnd = false;
-    }
   }
 
   /**
@@ -223,6 +219,10 @@ export class Transaction
       {
         Transaction.currentTransaction.close();
         Transaction.currentTransaction = null;
+        if (Transaction.collectCyclesAtEnd) {
+          Vertex.collectCycles();
+          Transaction.collectCyclesAtEnd = false;
+        }
       }
       return a;
     }