IDEA-68413 Invoke later if needed.
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 22 Apr 2011 07:37:17 +0000 (11:37 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 22 Apr 2011 07:40:22 +0000 (11:40 +0400)
platform/vcs-api/src/com/intellij/openapi/vcs/history/CurrentRevision.java

index 49aaa8b966d08de73e6d599d9be2b779ffc545b5..242d3d423db95dff561834486c412a4c57b6482e 100644 (file)
@@ -18,8 +18,9 @@ package com.intellij.openapi.vcs.history;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vcs.VcsBundle;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.ui.UIUtil;
 
 import java.io.IOException;
 import java.util.Date;
@@ -56,8 +57,13 @@ public class CurrentRevision implements VcsFileRevision {
         return myFile.contentsToByteArray();
       }
     }
-    catch (IOException e) {
-      Messages.showMessageDialog(e.getLocalizedMessage(), VcsBundle.message("message.text.could.not.load.file.content"), Messages.getErrorIcon());
+    catch (final IOException e) {
+      UIUtil.invokeLaterIfNeeded(new Runnable() {
+        @Override public void run() {
+          Messages.showMessageDialog(e.getLocalizedMessage(), VcsBundle.message("message.text.could.not.load.file.content"),
+                                     Messages.getErrorIcon());
+        }
+      });
       return null;
     }