From 9acb8dc334f677f5e44706bf7bd06870c90f1620 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 13 Jul 2018 19:11:12 +0300
Subject: [PATCH] IDEA-195542 Inconsistent and partial results in "Occurrences
 of" Find tool window tab after opening from  "Find in Path"

---
 .../src/com/intellij/usages/impl/SearchForUsagesRunnable.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/usageView/src/com/intellij/usages/impl/SearchForUsagesRunnable.java b/platform/usageView/src/com/intellij/usages/impl/SearchForUsagesRunnable.java
index e8c52c6ac108..88dd61c76844 100644
--- a/platform/usageView/src/com/intellij/usages/impl/SearchForUsagesRunnable.java
+++ b/platform/usageView/src/com/intellij/usages/impl/SearchForUsagesRunnable.java
@@ -295,8 +295,9 @@ class SearchForUsagesRunnable implements Runnable {
     int usageCount = myUsageCountWithoutDefinition.get();
     if (usageCount >= 2 || usageCount == 1 && myProcessPresentation.isShowPanelIfOnlyOneUsage()) {
       usageView = myUsageViewManager.createUsageView(mySearchFor, Usage.EMPTY_ARRAY, myPresentation, mySearcherFactory);
-      usageView.associateProgress(indicator);
       if (myUsageViewRef.compareAndSet(null, usageView)) {
+        // associate progress only if created successfully, otherwise Dispose will cancel the actual progress, see IDEA-195542
+        usageView.associateProgress(indicator);
         if (myProcessPresentation.isShowFindOptionsPrompt()) {
           openView(usageView);
         }