From cf7f9dffd5d0856bf3022590086d38f3f7e7f9b9 Mon Sep 17 00:00:00 2001
From: Artem Sokolovskii <artem.sokolovskii@qt.io>
Date: Thu, 8 Feb 2024 11:05:00 +0100
Subject: [PATCH] Android: Fix Segfault when cancelling Android SDK
 installation

Fixes: QTCREATORBUG-30246
Change-Id: I929779e4cd8c37c9d69bd7aaffe9ae5b9acb7435
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androidsdkdownloader.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/android/androidsdkdownloader.cpp b/src/plugins/android/androidsdkdownloader.cpp
index 6ff39dc4170..7246b5b9a3d 100644
--- a/src/plugins/android/androidsdkdownloader.cpp
+++ b/src/plugins/android/androidsdkdownloader.cpp
@@ -100,8 +100,8 @@ void AndroidSdkDownloader::downloadAndExtractSdk()
     m_progressDialog->setFixedSize(m_progressDialog->sizeHint());
     m_progressDialog->setAutoClose(false);
     connect(m_progressDialog.get(), &QProgressDialog::canceled, this, [this] {
-        m_progressDialog.release()->deleteLater();
         m_taskTreeRunner.reset();
+        m_progressDialog.release()->deleteLater();
     });
 
     Storage<std::optional<FilePath>> storage;
@@ -116,6 +116,8 @@ void AndroidSdkDownloader::downloadAndExtractSdk()
                 return;
             connect(reply, &QNetworkReply::downloadProgress,
                     this, [this](qint64 received, qint64 max) {
+                if (!m_progressDialog)
+                    return;
                 m_progressDialog->setRange(0, max);
                 m_progressDialog->setValue(received);
             });