diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2014-06-22 12:55:14 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2014-06-23 15:29:55 +0200 |
| commit | a6d8bbbb147f033167e47fc6fec8b442ade9aa7c (patch) | |
| tree | 8abc5e9678bbf7f651b5e95c368737b6992a453f /src/plugins/git/gitsubmiteditor.cpp | |
| parent | bbdd0655bc0a285e022587711d84ed02c7d4db48 (diff) | |
| download | qt-creator-a6d8bbbb147f033167e47fc6fec8b442ade9aa7c.tar.gz | |
VCS: Discard commit if submit widget is disabled
Change-Id: I8f11f56565f46919e93a30f754465de3bc44437e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/gitsubmiteditor.cpp')
| -rw-r--r-- | src/plugins/git/gitsubmiteditor.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp index a3b6a7454d..e35e298e88 100644 --- a/src/plugins/git/gitsubmiteditor.cpp +++ b/src/plugins/git/gitsubmiteditor.cpp @@ -90,7 +90,6 @@ GitSubmitEditor::GitSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *p m_model(0), m_commitEncoding(0), m_commitType(SimpleCommit), - m_forceClose(false), m_firstUpdate(true) { connect(this, SIGNAL(diffSelectedFiles(QList<int>)), this, SLOT(slotDiffSelected(QList<int>))); @@ -186,14 +185,12 @@ 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; m_model->clear(); widget()->setEnabled(false); } |