diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-03-12 15:46:16 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-03-13 12:58:59 +0000 |
| commit | 1c8b691620afb32dce65381b9c31573d756b2e23 (patch) | |
| tree | 13f1671d36a8efc9a6c5712b107993e7bc2ca47a /src/plugins/diffeditor/diffeditordocument.cpp | |
| parent | ca41c24cc68ea51733ec329b50da219d99d533b4 (diff) | |
| download | qt-creator-1c8b691620afb32dce65381b9c31573d756b2e23.tar.gz | |
DiffEditor: Do not soft-assert when saving
Do not soft-assert when saving a diff that was saved before.
Change-Id: Iebe06f2bf2ab966869181e0237ed6cc69b2f6045
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditordocument.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffeditordocument.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp index b091c3eece..510401e95a 100644 --- a/src/plugins/diffeditor/diffeditordocument.cpp +++ b/src/plugins/diffeditor/diffeditordocument.cpp @@ -76,10 +76,11 @@ DiffEditorDocument::~DiffEditorDocument() */ void DiffEditorDocument::setController(DiffEditorController *controller) { - QTC_ASSERT(isTemporary(), return); if (m_controller == controller) return; + QTC_ASSERT(isTemporary(), return); + if (m_controller) m_controller->deleteLater(); m_controller = controller; |