summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitsubmiteditor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/git/gitsubmiteditor.cpp')
-rw-r--r--src/plugins/git/gitsubmiteditor.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp
index d7844723b3..703ef82795 100644
--- a/src/plugins/git/gitsubmiteditor.cpp
+++ b/src/plugins/git/gitsubmiteditor.cpp
@@ -229,9 +229,10 @@ void GitSubmitEditor::updateFileModel()
m_firstUpdate = false;
return;
}
- if (m_workingDirectory.isEmpty())
+ GitSubmitEditorWidget *w = submitEditorWidget();
+ if (w->updateInProgress() || m_workingDirectory.isEmpty())
return;
- submitEditorWidget()->setUpdateInProgress(true);
+ w->setUpdateInProgress(true);
resetCommitDataFetcher();
m_commitDataFetcher = new CommitDataFetcher(m_commitType, m_workingDirectory);
connect(m_commitDataFetcher, SIGNAL(finished(bool)), this, SLOT(commitDataRetrieved(bool)));
@@ -244,10 +245,9 @@ void GitSubmitEditor::updateFileModel()
void GitSubmitEditor::commitDataRetrieved(bool success)
{
GitSubmitEditorWidget *w = submitEditorWidget();
- w->setUpdateInProgress(false);
if (success) {
setCommitData(m_commitDataFetcher->commitData());
- submitEditorWidget()->refreshLog(m_workingDirectory);
+ w->refreshLog(m_workingDirectory);
w->setEnabled(true);
} else {
// Nothing to commit left!
@@ -257,6 +257,7 @@ void GitSubmitEditor::commitDataRetrieved(bool success)
}
m_commitDataFetcher->deleteLater();
m_commitDataFetcher = 0;
+ w->setUpdateInProgress(false);
}
GitSubmitEditorPanelData GitSubmitEditor::panelData() const