From ea0c23771c8d442eec1f18039a16ce980d2fe54d Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Mon, 21 Mar 2016 09:33:48 +0100
Subject: [PATCH] DocumentManager::setCurrentDesignDocument(): Check
 m_currentDesignDocument.

Fix a crash occurring when dropping a .js file onto the Widget Designer.

Task-number: QTCREATORBUG-15903
Change-Id: I3e952df1483c5683fa7daa3a1f2fb8ebbbc1b491
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 src/plugins/qmldesigner/documentmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp
index 85ed6d3bfb5..baa8d6a4416 100644
--- a/src/plugins/qmldesigner/documentmanager.cpp
+++ b/src/plugins/qmldesigner/documentmanager.cpp
@@ -283,7 +283,7 @@ void DocumentManager::setCurrentDesignDocument(Core::IEditor *editor)
             m_designDocumentHash.insert(editor, m_currentDesignDocument);
             m_currentDesignDocument->setEditor(editor);
         }
-    } else {
+    } else if (!m_currentDesignDocument.isNull()) {
         m_currentDesignDocument->resetToDocumentModel();
         m_currentDesignDocument.clear();
     }