Rewrite menu_entries function

menu/drivers/rgui.c

@@ -540,7 +540,8 @@ static void rgui_render(void *data)
          RGUI_TERM_START_X(fb_width),
          title_buf, TITLE_COLOR(settings));
 
-   if (menu_entries_get_core_title(title_msg, sizeof(title_msg)) == 0)
+   if (settings->menu.core_enable && 
+         menu_entries_get_core_title(title_msg, sizeof(title_msg)) == 0)
       blit_line(
             RGUI_TERM_START_X(fb_width),
             (RGUI_TERM_HEIGHT(fb_width, fb_height) * FONT_HEIGHT_STRIDE) +

menu/drivers/xmb.c

@@ -2583,6 +2583,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
    char title_msg[255];
    char title_truncated[255];
    menu_display_frame_info_t menu_disp_info;
+   settings_t *settings                    = config_get_ptr();
    unsigned width                          = video_info->width;
    unsigned height                         = video_info->height;
    bool render_background                  = false;
@@ -2639,7 +2640,8 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
          xmb->margins.title.top, 1, 1, TEXT_ALIGN_LEFT,
          width, height, xmb->font);
 
-   if (menu_entries_get_core_title(title_msg, sizeof(title_msg)) == 0)
+   if (settings->menu.core_enable &&
+         menu_entries_get_core_title(title_msg, sizeof(title_msg)) == 0)
       xmb_draw_text(menu_disp_info, xmb, title_msg, xmb->margins.title.left,
             height - xmb->margins.title.bottom, 1, 1, TEXT_ALIGN_LEFT,
             width, height, xmb->font);

menu/drivers/xui.cpp

@@ -165,7 +165,9 @@ HRESULT CRetroArchMain::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
    {
       char str[PATH_MAX_LENGTH] = {0};
 
-      if (menu_entries_get_core_title(str, sizeof(str)) == 0)
+      if (
+            settings->menu.core_enable &&
+            menu_entries_get_core_title(str, sizeof(str)) == 0)
       {
          mbstowcs(strw_buffer, str, sizeof(strw_buffer) / sizeof(wchar_t));
          XuiTextElementSetText(m_menutitlebottom, strw_buffer);
@@ -563,7 +565,9 @@ static void xui_render(void *data)
 
    if (XuiHandleIsValid(m_menutitle))
    {
-      if (menu_entries_get_core_title(title, sizeof(title)) == 0)
+      if (
+            settings->menu.core_enable &&
+            menu_entries_get_core_title(title, sizeof(title)) == 0)
       {
          mbstowcs(strw_buffer, title, sizeof(strw_buffer) / sizeof(wchar_t));
          XuiTextElementSetText(m_menutitlebottom, strw_buffer);

menu/menu_entries.c

@@ -27,7 +27,6 @@
 #include "widgets/menu_list.h"
 
 #include "../core.h"
-#include "../configuration.h"
 #include "../runloop.h"
 #include "../version.h"
 
@@ -270,7 +269,6 @@ int menu_entries_get_core_title(char *s, size_t len)
 {
    struct retro_system_info    *system = NULL;
    rarch_system_info_t      *info = NULL;
-   settings_t *settings           = config_get_ptr();
    const char *core_name          = NULL;
    const char *core_version       = NULL;
 
@@ -282,9 +280,6 @@ int menu_entries_get_core_title(char *s, size_t len)
 
    runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &info);
 
-   if (!settings || !settings->menu.core_enable)
-      return -1; 
-
    if (string_is_empty(core_name) && info)
       core_name = info->info.library_name;
    if (string_is_empty(core_name))

ui/drivers/cocoa/cocoatouch_menu.m

@@ -29,6 +29,7 @@
 #include "../../../input/input_keymaps.h"
 #include "../../../input/drivers/cocoa_input.h"
 
+#include "../../../configuration.h"
 #include "../../../runloop.h"
 
 #ifdef HAVE_MENU
@@ -643,8 +644,8 @@ didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 
 - (void)viewWillAppear:(BOOL)animated
 {
-   char title_msg[256];
    UIBarButtonItem *item = NULL;
+   settings_t *settings  = config_get_ptr();
     
    [self reloadData];
 
@@ -654,19 +655,28 @@ didSelectRowAtIndexPath:(NSIndexPath *)indexPath
    item = [[UIBarButtonItem alloc] initWithCustomView:self.osdmessage];
    [self setToolbarItems: [NSArray arrayWithObject:item]];
 
-   menu_entries_get_core_title(title_msg, sizeof(title_msg));
-   self.osdmessage.text = BOXSTRING(title_msg);
+   if (settings->menu.core_enable)
+   {
+      char title_msg[256];
+      menu_entries_get_core_title(title_msg, sizeof(title_msg));
+      self.osdmessage.text = BOXSTRING(title_msg);
+   }
 }
 
 - (void)willReloadData
 {
    size_t i, end;
-   char title[256], title_msg[256];
+   char title[256];
    RAMainMenu* __weak weakSelf = NULL;
    NSMutableArray *everything  = [NSMutableArray array];
+   settings_t *settings        = config_get_ptr();
 
-   menu_entries_get_core_title(title_msg, sizeof(title_msg));
-   self.osdmessage.text = BOXSTRING(title_msg);
+   if (settings->menu.core_enable)
+   {
+      char title_msg[256];
+      menu_entries_get_core_title(title_msg, sizeof(title_msg));
+      self.osdmessage.text = BOXSTRING(title_msg);
+   }
 
    menu_entries_get_title(title, sizeof(title));
    self.title = BOXSTRING(title);