diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2014-08-04 15:59:25 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2014-08-04 15:27:00 +0200 |
| commit | ed02e7f3c51210a47a769568d5eeb4e5b26f7246 (patch) | |
| tree | bf5ea6cff2c32acba4a51c93806a282fe188ace8 /src/plugins/vcsbase | |
| parent | 4dd200259f28e608b845e3c063251b5157042397 (diff) | |
| download | qt-creator-ed02e7f3c51210a47a769568d5eeb4e5b26f7246.tar.gz | |
Git: Fix crash when returning to commit editor from diff
The crash happens on Linux/Xming. 2 subsequents calls to
slotRefreshCommitData occur, m_commitDataFetcher is released when the
first one is handled, and the second call dereferences NULL.
Change-Id: Ibc06fe5dd89b790ac84544f6842cbf345d118703
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/vcsbase')
| -rw-r--r-- | src/plugins/vcsbase/submiteditorwidget.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/vcsbase/submiteditorwidget.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/vcsbase/submiteditorwidget.cpp b/src/plugins/vcsbase/submiteditorwidget.cpp index efbc5d40c0..2568c4f532 100644 --- a/src/plugins/vcsbase/submiteditorwidget.cpp +++ b/src/plugins/vcsbase/submiteditorwidget.cpp @@ -583,6 +583,11 @@ void SubmitEditorWidget::setUpdateInProgress(bool value) updateSubmitAction(); } +bool SubmitEditorWidget::updateInProgress() const +{ + return d->m_updateInProgress; +} + QString SubmitEditorWidget::commitName() const { return tr("&Commit"); diff --git a/src/plugins/vcsbase/submiteditorwidget.h b/src/plugins/vcsbase/submiteditorwidget.h index 6d84197735..06a5a54a50 100644 --- a/src/plugins/vcsbase/submiteditorwidget.h +++ b/src/plugins/vcsbase/submiteditorwidget.h @@ -105,6 +105,7 @@ public: virtual bool canSubmit() const; void setUpdateInProgress(bool value); + bool updateInProgress() const; signals: void diffSelected(const QList<int> &); |