From b5601105e5f6285c02666a0682cfe6f5165f17ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Fri, 12 Mar 2010 17:57:41 +0100
Subject: [PATCH] Fixed crash when trying to activate a no longer existing
editor
This could happen when using Ctrl+Tab to switch editors, and while
holding Ctrl you close an editor with Ctrl+W, and then you try to select
it.
Since the crash was due to an assertion, we can just avoid it by doing
nothing when no editor for the given file is found.
Reviewed-by: mae
Task-number: QTCREATOR-190
---
src/plugins/coreplugin/editormanager/editormanager.cpp | 8 +++++---
src/plugins/coreplugin/editormanager/editormanager.h | 2 +-
.../coreplugin/editormanager/openeditorswindow.cpp | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 76b2ea1de85..94473ab1323 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -713,7 +713,7 @@ void EditorManager::closeEditor(const QModelIndex &index)
m_d->m_editorModel->removeEditor(index);
}
-bool EditorManager::closeEditors(const QList<IEditor*> editorsToClose, bool askAboutModifiedEditors)
+bool EditorManager::closeEditors(const QList<IEditor*> &editorsToClose, bool askAboutModifiedEditors)
{
if (editorsToClose.isEmpty())
return true;
@@ -939,8 +939,10 @@ Core::IEditor *EditorManager::activateEditor(Core::Internal::EditorView *view, C
Core::IEditor *EditorManager::activateEditor(Core::Internal::EditorView *view, Core::IFile *file, OpenEditorFlags flags)
{
- QList<IEditor*> editors = editorsForFile(file);
- Q_ASSERT(!editors.isEmpty());
+ const QList<IEditor*> editors = editorsForFile(file);
+ if (editors.isEmpty())
+ return 0;
+
return activateEditor(view, editors.first(), flags);
}
diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
index 781c9149db2..3697dd2a507 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -151,7 +151,7 @@ public:
bool saveEditor(IEditor *editor);
- bool closeEditors(const QList<IEditor *> editorsToClose, bool askAboutModifiedEditors = true);
+ bool closeEditors(const QList<IEditor *> &editorsToClose, bool askAboutModifiedEditors = true);
MakeWritableResult makeEditorWritable(IEditor *editor);
diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
index adea351d961..0a8210378c8 100644
--- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
@@ -242,7 +242,7 @@ void OpenEditorsWindow::setEditors(EditorView *mainView, EditorView *view, OpenE
first = false;
}
}
-}
+ }
// add purely restored editors which are not initialised yet
foreach (const OpenEditorsModel::Entry &entry, model->entries()) {
--
GitLab