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

Avoid having current editor that is not in a view.

Browse Source 
Was triggering soft assert when opening a session with multiple files
open, and then closing the first one.

Change-Id: I23a503904222b0126dc36d8b2dcc64021393b45c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2013-05-23 14:38:15 +02:00
parent 2753ca94c7
commit 2d3a7d432b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -1028,6 +1028,11 @@ bool EditorManager::closeEditors(const QList<IEditor*> &editorsToClose, bool ask
if (EditorView *view = viewForEditor(editor)) { if (EditorView *view = viewForEditor(editor)) {
if (editor == view->currentEditor()) if (editor == view->currentEditor())
closedViews += view; closedViews += view;
if (d->m_currentEditor == editor) {
// avoid having a current editor without view
setCurrentView(view);
setCurrentEditor(0);
}
view->removeEditor(editor); view->removeEditor(editor);
} }
} }
@@ -1494,9 +1499,7 @@ IEditor *EditorManager::openEditor(Core::Internal::EditorView *view, const QStri
// back to the default editor: // back to the default editor:
if (!editor) if (!editor)
editor = createEditor(Id(), fn); editor = createEditor(Id(), fn);
if (!editor) // Internal error QTC_ASSERT(editor, return 0);
return 0;
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
QString errorString; QString errorString;
if (!editor->open(&errorString, fn, realFn)) { if (!editor->open(&errorString, fn, realFn)) {