From c37ee615a66caa674183a558ea955a15f74d2ed7 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 30 Nov 2022 14:47:49 +0100
Subject: [PATCH] ICore: Fix possible crash in raiseWindow()

Don't call else branch with nullptr when window is nullptr.

Amends 79be19a8a024e70c572ee351493d648d5cbb50ee

Change-Id: I4c1ee3783d36374cbc6ad9555328b5737f2ce348
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/coreplugin/icore.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index 0ed4d4cc8a5..6d8a35b62c6 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -720,7 +720,9 @@ void ICore::raiseWindow(QWidget *widget)
     if (!widget)
         return;
     QWidget *window = widget->window();
-    if (window && window == m_mainwindow) {
+    if (!window)
+        return;
+    if (window == m_mainwindow) {
         m_mainwindow->raiseWindow();
     } else {
         window->raise();