Merge pull request #7924 from orbea/menu_null

menu: Fix quick menu toggle crash with the null menu driver.
This commit is contained in:
Twinaphex 2019-01-07 21:57:18 +01:00 committed by GitHub
commit 54a795bfd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2954,8 +2954,10 @@ static enum runloop_state runloop_check_state(
/* Check menu toggle */
{
static bool old_pressed = false;
char *menu_driver = settings->arrays.menu_driver;
bool pressed = BIT256_GET(
current_input, RARCH_MENU_TOGGLE);
current_input, RARCH_MENU_TOGGLE) &&
!string_is_equal(menu_driver, "null");
if (menu_event_kb_is_set(RETROK_F1) == 1)
{