From 65d2f87f6c577f51d9324075dd4cb5cfa2e99028 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 16 Mar 2021 13:10:53 +0100
Subject: [PATCH] Editors: Fix another soft assert about current view

Task-number: QTCREATORBUG-24869
Change-Id: I575153a909f398ade4dce4edbb4927ea0d35c20f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/coreplugin/editormanager/editormanager.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index f45b49ae1b9..ff4902457cb 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);
                         }
                     }
                 }