Merge remote-tracking branch 'origin/4.3' into master

Change-Id: I83af635dcac98e4fd78b21d8dd9dc3a27a4fdf94
This commit is contained in:
Orgad Shaneh
2017-06-12 10:00:50 +03:00
24 changed files with 9195 additions and 5567 deletions

View File

@@ -302,7 +302,7 @@ void GerritPlugin::updateActions(const VcsBase::VcsBasePluginState &state)
const bool hasTopLevel = state.hasTopLevel();
m_gerritCommand->action()->setEnabled(hasTopLevel);
m_pushToGerritCommand->action()->setEnabled(hasTopLevel);
if (m_dialog)
if (m_dialog && m_dialog->isVisible())
m_dialog->setCurrentPath(state.topLevel());
}