From af1127f757896190be16bafb2c0a2640a24195c2 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 5 Jan 2016 23:40:21 +0200
Subject: [PATCH] VCS: Do not delete SubmitFileModel before setting the new one
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

setFileModel() calls QTreeView::clearSelection() before setting the new model.
If the view has no model (because it was deleted earlier), a warning is shown.

Change-Id: Id694b073360b08bd8fd4e8b1db04250a71f792c1
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
---
 src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index fa76c8353a0..20bc29f24fa 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -417,11 +417,11 @@ QStringList VcsBaseSubmitEditor::checkedFiles() const
 void VcsBaseSubmitEditor::setFileModel(SubmitFileModel *model)
 {
     QTC_ASSERT(model, return);
-    if (SubmitFileModel *oldModel = d->m_widget->fileModel()) {
+    SubmitFileModel *oldModel = d->m_widget->fileModel();
+    if (oldModel)
         model->updateSelections(oldModel);
-        delete oldModel;
-    }
     d->m_widget->setFileModel(model);
+    delete oldModel;
 
     QSet<QString> uniqueSymbols;
     const CPlusPlus::Snapshot cppSnapShot = CppTools::CppModelManager::instance()->snapshot();