ScriptClassRootsUpdater: fix clearing scheduledUpdate and check cancelled in sync

2020-05-07 15:45:26 +03:00
parent 2932c67db7
commit 59c35fe35c
1 changed files with 7 additions and 5 deletions
@@ -123,12 +123,14 @@ class ScriptClassRootsUpdater(

    fun doUpdate(underProgressManager: Boolean = true) {
        syncLock.withLock {
-            val updates = manager.collectRootsAndCheckNew()
-
-            if (!updates.changed) return
-
            try {
-                ProgressManager.checkCanceled()
+                val updates = manager.collectRootsAndCheckNew()
+
+                if (!updates.changed) return
+
+                if (underProgressManager) {
+                    ProgressManager.checkCanceled()
+                }

                if (updates.hasNewRoots) {
                    notifyRootsChanged()