From 3cd5386003a6efac9c39a796786084dbc8dba5ae Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 25 Jun 2015 18:14:16 +0300 Subject: [PATCH] [git] Fix possible NPE if the status bar has already been disposed (update can be called later) --- plugins/git4idea/src/git4idea/ui/branch/GitBranchWidget.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitBranchWidget.java b/plugins/git4idea/src/git4idea/ui/branch/GitBranchWidget.java index 629f83d1ca16..dcf52ff48a24 100644 --- a/plugins/git4idea/src/git4idea/ui/branch/GitBranchWidget.java +++ b/plugins/git4idea/src/git4idea/ui/branch/GitBranchWidget.java @@ -165,7 +165,9 @@ public class GitBranchWidget extends EditorBasedWidget implements StatusBarWidge int maxLength = myMaxString.length() - 1; // -1, because there are arrows indicating that it is a popup myText = StringUtil.shortenTextWithEllipsis(GitBranchUtil.getDisplayableBranchText(repo), maxLength, 5); myTooltip = getDisplayableBranchTooltip(repo); - myStatusBar.updateWidget(ID()); + if (myStatusBar != null) { + myStatusBar.updateWidget(ID()); + } mySettings.setRecentRoot(repo.getRoot().getPath()); }