safe fixes for orphaned runReadActionInSmartMode threads (IDEA-177146, IDEA-176982)

This commit is contained in:
peter
2017-08-07 16:37:29 +02:00
parent 710287a3b1
commit df2e8c22a4
2 changed files with 7 additions and 2 deletions
@@ -1442,7 +1442,10 @@ public abstract class ChooseByNameBase {
@Override
public void onCanceled(@NotNull ProgressIndicator indicator) {
LOG.assertTrue(myCalcElementsThread == this, myCalcElementsThread);
new CalcElementsThread(myPattern, myCheckboxState, myCallback, myModalityState).scheduleThread();
if (!myProject.isDisposed()) {
new CalcElementsThread(myPattern, myCheckboxState, myCallback, myModalityState).scheduleThread();
}
}
private void addElementsByPattern(@NotNull String pattern,
@@ -85,7 +85,9 @@ public class MvcProjectWithoutLibraryNotificator implements StartupActivity, Dum
@Override
public void onCanceled(@NotNull ProgressIndicator indicator) {
ProgressIndicatorUtils.scheduleWithWriteActionPriority(this);
if (!project.isDisposed()) {
ProgressIndicatorUtils.scheduleWithWriteActionPriority(this);
}
}
});
}