From c29ef119561abf453a57100b375a4f5651f44293 Mon Sep 17 00:00:00 2001
From: mae <qt-info@nokia.com>
Date: Wed, 16 Jun 2010 10:42:48 +0200
Subject: [PATCH] Fix Esc handling setFocusToEditor()

Switching modes was broken.
---
 src/plugins/coreplugin/mainwindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 4f8703fb067..fbbf028b3de 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -838,7 +838,7 @@ void MainWindow::setFocusToEditor()
     if (IEditor *editor = m_editorManager->currentEditor()) {
         if (qApp->focusWidget() != editor->widget()) {
             editor->widget()->setFocus();
-            focusWasMovedToEditor = true;
+            focusWasMovedToEditor = editor->widget()->hasFocus();
         }
     }
 
-- 
GitLab