From dc18955b28890943ebb15ea8e075537cdd54b1dd Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Wed, 22 Sep 2021 23:40:59 +0200 Subject: [PATCH] Disabled the skip game functionality for the single-game scraper. --- es-app/src/guis/GuiScraperSearch.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/es-app/src/guis/GuiScraperSearch.cpp b/es-app/src/guis/GuiScraperSearch.cpp index 8873aed8d..d749c1302 100644 --- a/es-app/src/guis/GuiScraperSearch.cpp +++ b/es-app/src/guis/GuiScraperSearch.cpp @@ -567,8 +567,9 @@ bool GuiScraperSearch::input(InputConfig* config, Input input) openInputScreen(mLastSearch); } - // Skip game, unless the result has already been accepted. - if (!mAcceptedResult && config->isMappedTo("x", input) && input.value) + // If multi-scraping, skip game unless the result has already been accepted. + if (mSkipCallback != nullptr && !mAcceptedResult && // Line break. + config->isMappedTo("x", input) && input.value) mSkipCallback(); return GuiComponent::input(config, input); @@ -932,7 +933,11 @@ std::vector GuiScraperSearch::getHelpPrompts() std::vector prompts; prompts.push_back(HelpPrompt("y", "refine search")); - prompts.push_back(HelpPrompt("x", "skip")); + + // Only show the skip prompt during multi-scraping. + if (mSkipCallback != nullptr) + prompts.push_back(HelpPrompt("x", "skip")); + if (mFoundGame && (mRefinedSearch || mSearchType != ACCEPT_SINGLE_MATCHES || (mSearchType == ACCEPT_SINGLE_MATCHES && mScraperResults.size() > 1))) prompts.push_back(HelpPrompt("a", "accept result"));