From 3c94f63e67a0d58f160ff7635b8b6c0ca2cd4680 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 5 Mar 2024 13:22:25 +0100 Subject: [PATCH] Android: Guard against assert due to invalid access Change-Id: I4f98f18b786c95acae09a3be3b924953f1292e61 Reviewed-by: Artem Sokolovskii Reviewed-by: --- src/plugins/android/androidbuildapkstep.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index 34c6a9b619a..c57d008705d 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -228,11 +228,12 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) m_step->setBuildToolsVersion(buildToolsSdkComboBox->itemData(idx).value()); }); - const int initIdx = (m_step->buildToolsVersion().majorVersion() < 1) - ? buildToolsVersions.indexOf(buildToolsVersions.last()) - : buildToolsVersions.indexOf(m_step->buildToolsVersion()); - buildToolsSdkComboBox->setCurrentIndex(initIdx); - + if (!buildToolsVersions.isEmpty()) { + const int initIdx = (m_step->buildToolsVersion().majorVersion() < 1) + ? buildToolsVersions.indexOf(buildToolsVersions.last()) + : buildToolsVersions.indexOf(m_step->buildToolsVersion()); + buildToolsSdkComboBox->setCurrentIndex(initIdx); + } auto createAndroidTemplatesButton = new QPushButton(Tr::tr("Create Templates")); createAndroidTemplatesButton->setToolTip(