feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

DocumentManager::setCurrentDesignDocument(): Check m_currentDesignDocument.

Browse Source 
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>
This commit is contained in:
Friedemann Kleint
2016-03-21 09:33:48 +01:00
committed by Tim Jenssen
parent a3b2809417
commit ea0c23771c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/documentmanager.cpp
View File

@@ -283,7 +283,7 @@ void DocumentManager::setCurrentDesignDocument(Core::IEditor *editor)
m_designDocumentHash.insert(editor, m_currentDesignDocument); m_designDocumentHash.insert(editor, m_currentDesignDocument);
m_currentDesignDocument->setEditor(editor); m_currentDesignDocument->setEditor(editor);
} }
} else { } else if (!m_currentDesignDocument.isNull()) {
m_currentDesignDocument->resetToDocumentModel(); m_currentDesignDocument->resetToDocumentModel();
m_currentDesignDocument.clear(); m_currentDesignDocument.clear();
} }