From 9c768825303b98ce7ec31e9dfedebbb99c2fe1c0 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon.styhre@nw-soft.com>
Date: Tue, 4 Feb 2025 18:01:51 +0100
Subject: [PATCH] Fixed an issue where the default helpsystem element was not
 displayed if there was no theme configuration for it

---
 es-app/src/views/GamelistView.cpp |  6 +++++-
 es-app/src/views/SystemView.cpp   | 12 ++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/es-app/src/views/GamelistView.cpp b/es-app/src/views/GamelistView.cpp
index f0817ba1a..2e86443a0 100644
--- a/es-app/src/views/GamelistView.cpp
+++ b/es-app/src/views/GamelistView.cpp
@@ -514,7 +514,11 @@ void GamelistView::render(const glm::mat4& parentTrans)
 
 std::vector<HelpPrompt> GamelistView::getHelpPrompts()
 {
-    mWindow->passHelpComponents(&mHelpComponents);
+    if (mHelpComponents.empty())
+        mWindow->passHelpComponents(nullptr);
+    else
+        mWindow->passHelpComponents(&mHelpComponents);
+
     std::vector<HelpPrompt> prompts;
 
     if (Settings::getInstance()->getString("QuickSystemSelect") != "disabled") {
diff --git a/es-app/src/views/SystemView.cpp b/es-app/src/views/SystemView.cpp
index 57f218e30..0cafbb11c 100644
--- a/es-app/src/views/SystemView.cpp
+++ b/es-app/src/views/SystemView.cpp
@@ -211,7 +211,11 @@ void SystemView::onThemeChanged(const std::shared_ptr<ThemeData>& /*theme*/)
 
 std::vector<HelpPrompt> SystemView::getHelpPrompts()
 {
-    mWindow->passHelpComponents(&mSystemElements[mPrimary->getCursor()].helpComponents);
+    if (mSystemElements[mPrimary->getCursor()].helpComponents.empty())
+        mWindow->passHelpComponents(nullptr);
+    else
+        mWindow->passHelpComponents(&mSystemElements[mPrimary->getCursor()].helpComponents);
+
     std::vector<HelpPrompt> prompts;
 
     if (mCarousel != nullptr) {
@@ -885,7 +889,11 @@ void SystemView::populate()
         }
     }
 
-    mWindow->passHelpComponents(&mSystemElements[mPrimary->getCursor()].helpComponents);
+    if (mSystemElements[mPrimary->getCursor()].helpComponents.empty())
+        mWindow->passHelpComponents(nullptr);
+    else
+        mWindow->passHelpComponents(&mSystemElements[mPrimary->getCursor()].helpComponents);
+
     mFadeTransitions = (static_cast<ViewTransitionAnimation>(Settings::getInstance()->getInt(
                             "TransitionsSystemToSystem")) == ViewTransitionAnimation::FADE);
 }