diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-19 22:27:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-19 21:25:05 +0000 |
| commit | 4ca751c002784c4bfd349cc5240b045b62277c80 (patch) | |
| tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /plugins/git4idea/src/git4idea/ui/branch/GitBranchWidget.java | |
| parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
| parent | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff) | |
| download | idea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'plugins/git4idea/src/git4idea/ui/branch/GitBranchWidget.java')
| -rw-r--r-- | plugins/git4idea/src/git4idea/ui/branch/GitBranchWidget.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitBranchWidget.java b/plugins/git4idea/src/git4idea/ui/branch/GitBranchWidget.java index 80074fb64a28..4d3497fae299 100644 --- a/plugins/git4idea/src/git4idea/ui/branch/GitBranchWidget.java +++ b/plugins/git4idea/src/git4idea/ui/branch/GitBranchWidget.java @@ -136,7 +136,7 @@ public class GitBranchWidget extends EditorBasedWidget implements StatusBarWidge @Override public void run() { Project project = getProject(); - if (project == null) { + if (project == null || project.isDisposed()) { emptyTextAndTooltip(); return; } |