From 11faacb43a638dd1bb6bdd17e5d9984df816960f Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Mon, 27 Feb 2023 20:16:23 +0100 Subject: [PATCH] Fixed an issue where attempting to open the menu during startup would crash the application. --- es-app/src/views/ViewController.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-app/src/views/ViewController.cpp b/es-app/src/views/ViewController.cpp index 9356bf3bc..28080944a 100644 --- a/es-app/src/views/ViewController.cpp +++ b/es-app/src/views/ViewController.cpp @@ -1015,7 +1015,7 @@ bool ViewController::input(InputConfig* config, Input input) // Open the main menu. if (!(UIModeController::getInstance()->isUIModeKid() && !Settings::getInstance()->getBool("EnableMenuKidMode")) && - config->isMappedTo("start", input) && input.value != 0) { + config->isMappedTo("start", input) && input.value != 0 && mCurrentView != nullptr) { // If we don't stop the scrolling here, it will continue to // run after closing the menu. if (mSystemListView->isScrolling())