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

QmlDesigner: Switch back to edit mode if last .qml file closes

Browse Source 
Fixes multiple ways to crash QmlDesigner after last .qml file is closed
by enforcing a switch to Edit mode then.

Patch originally done by con.
This commit is contained in:
Kai Koehne
2010-04-06 15:10:20 +02:00
parent 0531e8007a
commit 5b65a60e78
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/designmode.cpp
View File

@@ -207,7 +207,7 @@ void DesignMode::unregisterDesignWidget(QWidget *widget)
// if editor changes, check if we have valid mimetype registered. // if editor changes, check if we have valid mimetype registered.
void DesignMode::currentEditorChanged(Core::IEditor *editor) void DesignMode::currentEditorChanged(Core::IEditor *editor)
{ {
if (d->m_currentEditor.data() == editor) if (editor && (d->m_currentEditor.data() == editor))
return; return;
bool mimeEditorAvailable = false; bool mimeEditorAvailable = false;
@@ -239,6 +239,8 @@ void DesignMode::currentEditorChanged(Core::IEditor *editor)
if (!mimeEditorAvailable) { if (!mimeEditorAvailable) {
setActiveContext(QList<int>()); setActiveContext(QList<int>());
if (core->modeManager()->currentMode() == this)
core->modeManager()->activateMode(Core::Constants::MODE_EDIT);
setEnabled(false); setEnabled(false);
d->m_currentEditor = QWeakPointer<Core::IEditor>(); d->m_currentEditor = QWeakPointer<Core::IEditor>();
emit actionsUpdated(d->m_currentEditor.data()); emit actionsUpdated(d->m_currentEditor.data());