aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2021-03-16 13:10:53 +0100
committerEike Ziller <eike.ziller@qt.io>2021-03-16 13:55:30 +0000
commit65d2f87f6c577f51d9324075dd4cb5cfa2e99028 (patch)
tree6d44b22f09beee79469eb69ad794d0a3f7c1f886
parent1f3cd3c70fb38e570f44e17b2c8e2c6bad54f11c (diff)
Editors: Fix another soft assert about current view
Task-number: QTCREATORBUG-24869 Change-Id: I575153a909f398ade4dce4edbb4927ea0d35c20f Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--src/plugins/coreplugin/editormanager/editormanager.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index f45b49ae1b..ff4902457c 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -1730,6 +1730,11 @@ bool EditorManagerPrivate::closeEditors(const QList<IEditor*> &editors, CloseFla
if (IDocument *document = documents.last()->document) {
activateEditorForDocument(view, document, flags);
}
+ } else {
+ // no documents left - set current view since view->removeEditor can
+ // trigger a focus change, context change, and updateActions, which
+ // requests the current EditorView
+ setCurrentView(currentView);
}
}
}