diff --git a/frontend/menu/disp/lakka.c b/frontend/menu/disp/lakka.c index 6019c74410..e39469f200 100644 --- a/frontend/menu/disp/lakka.c +++ b/frontend/menu/disp/lakka.c @@ -540,7 +540,7 @@ static void lakka_draw_items(int i) continue; if (i >= menu_active_category - 1 && - i <= menu_active_category + 1) /* performance improvement */ + i <= menu_active_category + 1) /* performance improvement */ { lakka_draw_icon(category->item_icon, margin_left + hspacing*(i+1) + @@ -895,11 +895,14 @@ static void lakka_context_reset(void *data) if (info_list) info = (core_info_t*)&info_list->list[i-1]; - if (info != NULL && info->systemname) { + if (info != NULL && info->systemname) + { char *tmp = str_replace(info->systemname, "/", " "); strlcpy(core_id, tmp, sizeof(core_id)); free(tmp); - } else { + } + else + { strlcpy(core_id, "default", sizeof(core_id)); } @@ -1059,13 +1062,17 @@ static void lakka_init_core_info(void *data) core_info_list_free(g_extern.core_info); g_extern.core_info = NULL; - if (*g_settings.libretro_directory) { + if (*g_settings.libretro_directory) + { g_extern.core_info = core_info_list_new(g_settings.libretro_directory); } - if (g_extern.core_info) { + if (g_extern.core_info) + { num_categories = g_extern.core_info->count + 1; - } else { + } + else + { num_categories = 1; } } @@ -1075,6 +1082,7 @@ static void *lakka_init(void) int i; menu_handle_t *menu = (menu_handle_t*)calloc(1, sizeof(*menu)); gl_t *gl = (gl_t*)driver.video_data; + if (!menu || !gl) return NULL;