From e75911cee76e23572ea715bd4564d34504295b52 Mon Sep 17 00:00:00 2001
From: jdgleaver <james@leaver.myzen.co.uk>
Date: Mon, 12 Aug 2019 17:35:25 +0100
Subject: [PATCH] (XMB/Ozone/GLUI) Prevent display of main menu 'Quick Menu'
entry when dummy core is loaded
---
menu/drivers/materialui.c | 7 +++++--
menu/drivers/ozone/ozone.c | 7 +++++--
menu/drivers/stripes.c | 7 +++++--
menu/drivers/xmb.c | 7 +++++--
4 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index c90588c0f4..159ac63d0a 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -2069,8 +2069,11 @@ static int materialui_list_push(void *data, void *userdata,
!string_is_equal(system->info.library_name,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE)))
{
- entry.enum_idx = MENU_ENUM_LABEL_CONTENT_SETTINGS;
- menu_displaylist_setting(&entry);
+ if (!rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL))
+ {
+ entry.enum_idx = MENU_ENUM_LABEL_CONTENT_SETTINGS;
+ menu_displaylist_setting(&entry);
+ }
}
if (system->load_no_content)
diff --git a/menu/drivers/ozone/ozone.c b/menu/drivers/ozone/ozone.c
index ac723f6e34..a32240ba41 100644
--- a/menu/drivers/ozone/ozone.c
+++ b/menu/drivers/ozone/ozone.c
@@ -837,8 +837,11 @@ static int ozone_list_push(void *data, void *userdata,
!string_is_equal(system->info.library_name,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE)))
{
- entry.enum_idx = MENU_ENUM_LABEL_CONTENT_SETTINGS;
- menu_displaylist_setting(&entry);
+ if (!rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL))
+ {
+ entry.enum_idx = MENU_ENUM_LABEL_CONTENT_SETTINGS;
+ menu_displaylist_setting(&entry);
+ }
}
if (system->load_no_content)
diff --git a/menu/drivers/stripes.c b/menu/drivers/stripes.c
index c70cdd305d..655daef95d 100644
--- a/menu/drivers/stripes.c
+++ b/menu/drivers/stripes.c
@@ -4199,8 +4199,11 @@ static int stripes_list_push(void *data, void *userdata,
!string_is_equal(system->info.library_name,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE)))
{
- entry.enum_idx = MENU_ENUM_LABEL_CONTENT_SETTINGS;
- menu_displaylist_setting(&entry);
+ if (!rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL))
+ {
+ entry.enum_idx = MENU_ENUM_LABEL_CONTENT_SETTINGS;
+ menu_displaylist_setting(&entry);
+ }
}
if (system->load_no_content)
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index cd582a30c1..ce729a76f3 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -5683,8 +5683,11 @@ static int xmb_list_push(void *data, void *userdata,
!string_is_equal(system->info.library_name,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE)))
{
- entry.enum_idx = MENU_ENUM_LABEL_CONTENT_SETTINGS;
- menu_displaylist_setting(&entry);
+ if (!rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL))
+ {
+ entry.enum_idx = MENU_ENUM_LABEL_CONTENT_SETTINGS;
+ menu_displaylist_setting(&entry);
+ }
}
if (system->load_no_content)