From 1f0f74cdd2a0bb1db44ae37dc08a9a1844203ebb Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 23 Jan 2012 13:59:54 +0400 Subject: [PATCH] NPE --- plugins/git4idea/src/git4idea/config/GitVcsPanel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/config/GitVcsPanel.java b/plugins/git4idea/src/git4idea/config/GitVcsPanel.java index 9d747225be68..038951c9bcae 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsPanel.java +++ b/plugins/git4idea/src/git4idea/config/GitVcsPanel.java @@ -74,7 +74,8 @@ public class GitVcsPanel { myConvertTextFilesComboBox.setSelectedItem(CRLF_ASK); myGitField.addBrowseFolderListener(GitBundle.getString("find.git.title"), GitBundle.getString("find.git.description"), project, FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor()); - mySyncBranchControl.setVisible(GitRepositoryManager.getInstance(project).moreThanOneRoot()); + final GitRepositoryManager repositoryManager = GitRepositoryManager.getInstance(project); + mySyncBranchControl.setVisible(repositoryManager != null && repositoryManager.moreThanOneRoot()); } /**