From 1c8b691620afb32dce65381b9c31573d756b2e23 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 12 Mar 2015 15:46:16 +0100 Subject: 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 --- src/plugins/diffeditor/diffeditordocument.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/plugins/diffeditor/diffeditordocument.cpp') 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; -- cgit v1.2.1