MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-62667 NPE in git branch widget [review=denis.zhdanov]

Browse Source
This commit is contained in:
irengrig
2010-12-08 12:14:48 +03:00
parent a2e88a8a41
commit 294eb992e0
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/checkout/branches/GitCurrentBranchWidget.java
+14 -1
View File
@@ -15,12 +15,14 @@
*/
package git4idea.checkout.branches;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.fileEditor.FileEditorManagerEvent;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.Task;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vcs.AbstractVcs;
import com.intellij.openapi.vcs.ProjectLevelVcsManager;
@@ -151,7 +153,18 @@ public class GitCurrentBranchWidget extends EditorBasedWidget implements StatusB
currentBranchName = "";
}
myCurrentBranchName.set(currentBranchName);
myStatusBar.updateWidget(ID());
// status bar update would be anyway invoked on awt thread
// check not-disposed predicates before (they will be also checked on awt thread)
// in any other thread we wouldn't have guarantee that disposed hadn't started in parallel
ApplicationManager.getApplication().invokeLater(new Runnable() {
public void run() {
myStatusBar.updateWidget(ID());
}
}, new Condition() {
public boolean value(Object o) {
return isDisposed() || (project != null) && ((! project.isOpen()) || project.isDisposed()) || myStatusBar == null;
}
});
}
};
if (project == null) {