diff options
-rw-r--r-- | src/plugins/git/gitsubmiteditor.cpp | 6 | ||||
-rw-r--r-- | src/plugins/git/gitsubmiteditor.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp index 7857171768..631094d803 100644 --- a/src/plugins/git/gitsubmiteditor.cpp +++ b/src/plugins/git/gitsubmiteditor.cpp @@ -179,12 +179,16 @@ void GitSubmitEditor::updateFileModel() QString errorMessage, commitTemplate; CommitData data(m_commitType); if (client->getCommitData(m_workingDirectory, &commitTemplate, data, &errorMessage)) { + m_forceClose = false; setCommitData(data); submitEditorWidget()->refreshLog(m_workingDirectory); + widget()->setEnabled(true); } else { + // Nothing to commit left! VcsBase::VcsBaseOutputWindow::instance()->appendError(errorMessage); m_forceClose = true; - Core::EditorManager::closeEditor(this); + m_model->clear(); + widget()->setEnabled(false); } } diff --git a/src/plugins/git/gitsubmiteditor.h b/src/plugins/git/gitsubmiteditor.h index e2e093cfe2..75b2cf5e83 100644 --- a/src/plugins/git/gitsubmiteditor.h +++ b/src/plugins/git/gitsubmiteditor.h @@ -53,7 +53,7 @@ public: void setCommitData(const CommitData &); GitSubmitEditorPanelData panelData() const; - bool forceClose() const { return m_forceClose; } + bool forceClose() { updateFileModel(); return m_forceClose; } CommitType commitType() const { return m_commitType; } QString amendSHA1() const; |