From 2bbb2a94325dd160283bffa7e2a1f6d862fe45f0 Mon Sep 17 00:00:00 2001 From: irengrig Date: Wed, 16 May 2012 13:10:03 +0400 Subject: [PATCH] svn: fix assertion in live provider (that loads revision history for select revision) --- .../src/org/jetbrains/idea/svn/history/LiveProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/LiveProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/LiveProvider.java index 8aa5b8b9c168..14c96d250bd7 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/LiveProvider.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/LiveProvider.java @@ -15,6 +15,7 @@ */ package org.jetbrains.idea.svn.history; +import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; @@ -73,7 +74,8 @@ public class LiveProvider implements BunchProvider { } }; - if (ApplicationManager.getApplication().isUnitTestMode()) { + final Application application = ApplicationManager.getApplication(); + if (application.isUnitTestMode() || ! application.isDispatchThread()) { loader.run(); } else { ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() {