From be376f043cbbebb6a0025fb470317d2192c4164b Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Fri, 10 May 2024 21:10:07 +0200
Subject: [PATCH] StudioWelcome: silent splashscreen if there is a dialog open

Task-number: QDS-12713
Change-Id: I206f132f526928fb02ea8d2f117c0ba19c08156e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
(cherry picked from commit cf614eca9150b59e7f42bcd22098fe67dff4b2af)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/plugins/studiowelcome/studiowelcomeplugin.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
index fe209b5fd0b..fae0c83d41d 100644
--- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp
+++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
@@ -587,6 +587,9 @@ static bool forceDownLoad()
 
 static bool showSplashScreen()
 {
+    // some error dialog is maybe open, be silent to avoid focus problems (macOS had some)
+    if (Core::ICore::mainWindow() != Core::ICore::dialogParent())
+        return false;
     const Key lastQDSVersionEntry = "QML/Designer/lastQDSVersion";
 
     QtcSettings *settings = Core::ICore::settings();