--- a/eric6/Plugins/PluginVcsGit.py Sat Aug 15 16:27:07 2020 +0200 +++ b/eric6/Plugins/PluginVcsGit.py Sat Aug 15 19:14:03 2020 +0200 @@ -234,17 +234,13 @@ from VcsPlugins.vcsGit.git import Git self.__object = Git(self, self.__ui) - tbData = self.__ui.getToolbar("vcs") - if tbData: - tb = tbData[1] - tb.setVisible(False) - tb.setEnabled(False) + tb = self.__ui.getToolbar("vcs")[1] + tb.setVisible(False) + tb.setEnabled(False) - tbData = self.__ui.getToolbar("git") - if tbData: - tb = tbData[1] - tb.setVisible(True) - tb.setEnabled(True) + tb = self.__ui.getToolbar("git")[1] + tb.setVisible(Preferences.getVCS("ShowVcsToolbar")) + tb.setEnabled(True) return self.__object, True @@ -254,17 +250,13 @@ """ self.__object = None - tbData = self.__ui.getToolbar("git") - if tbData: - tb = tbData[1] - tb.setVisible(False) - tb.setEnabled(False) + tb = self.__ui.getToolbar("git")[1] + tb.setVisible(False) + tb.setEnabled(False) - tbData = self.__ui.getToolbar("vcs") - if tbData: - tb = tbData[1] - tb.setVisible(True) - tb.setEnabled(True) + tb = self.__ui.getToolbar("vcs")[1] + tb.setVisible(Preferences.getVCS("ShowVcsToolbar")) + tb.setEnabled(True) @classmethod def getPreferences(cls, key):