From 943cd619906bf4396e23e0eab2dffdf596763919 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sun, 8 Oct 2023 13:25:45 -0400 Subject: [PATCH] News: Handle no banner images case a bit better This stops it from spamming the logs with nonsense --- launcher/ui/Pages/NewsPage.qml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/launcher/ui/Pages/NewsPage.qml b/launcher/ui/Pages/NewsPage.qml index 5e36ff2..6a3f571 100644 --- a/launcher/ui/Pages/NewsPage.qml +++ b/launcher/ui/Pages/NewsPage.qml @@ -33,10 +33,14 @@ QQC2.Control { running: true repeat: true onTriggered: { + if (page.numBannerImages === 0) { + return; + } + if (page.currentBannerIndex + 1 === page.numBannerImages) { - page.currentBannerIndex = 0 + page.currentBannerIndex = 0; } else { - page.currentBannerIndex++ + page.currentBannerIndex++; } } } @@ -56,7 +60,17 @@ QQC2.Control { Layout.preferredHeight: aspectRatio * width Layout.alignment: Qt.AlignHCenter | Qt.AlignTop - source: LauncherCore.headline !== null ? LauncherCore.headline.banners[page.currentBannerIndex].bannerImage : "" + source: { + if (LauncherCore.headline === null) { + return ""; + } + + if (page.numBannerImages === 0) { + return ""; + } + + return LauncherCore.headline.banners[page.currentBannerIndex].bannerImage; + } MouseArea { anchors.fill: parent