diff --git a/gfx/gfx_animation.c b/gfx/gfx_animation.c index 07c91389ba..59668be808 100644 --- a/gfx/gfx_animation.c +++ b/gfx/gfx_animation.c @@ -1655,7 +1655,7 @@ void gfx_animation_deinit(void) void gfx_animation_timer_start(float *timer, gfx_timer_ctx_entry_t *timer_entry) { gfx_animation_ctx_entry_t entry; - uintptr_t tag = (uintptr_t) timer; + uintptr_t tag = (uintptr_t)timer; gfx_animation_kill_by_tag(&tag); diff --git a/libretro-common/formats/m3u/m3u_file.c b/libretro-common/formats/m3u/m3u_file.c index 2eb8a8da24..ba85528076 100644 --- a/libretro-common/formats/m3u/m3u_file.c +++ b/libretro-common/formats/m3u/m3u_file.c @@ -474,7 +474,6 @@ bool m3u_file_save( { size_t i; char base_dir[DIR_MAX_LENGTH]; - char *last_slash = NULL; RFILE *file = NULL; if (!m3u_file || !m3u_file->entries) @@ -485,7 +484,7 @@ bool m3u_file_save( return false; /* Get M3U file base directory */ - if ((last_slash = find_last_slash(m3u_file->path))) + if (find_last_slash(m3u_file->path)) fill_pathname_basedir(base_dir, m3u_file->path, sizeof(base_dir)); else base_dir[0] = '\0'; diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 22e5f10165..b14a6a69ae 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -5100,10 +5100,6 @@ static void materialui_render_menu_entry_playlist_desktop( int divider_y = entry_y + (int)node->entry_height; int entry_margin = (int)mui->margin; int usable_width = node->entry_width - (int)(mui->margin * 2); - /* Entry label is drawn at the vertical centre - * of the current node */ - int label_y = entry_y + (node->entry_height / 2.0f) + - mui->font_data.list.line_centre_offset; bool draw_text_outside = (x_offset != 0); /* To prevent any ugly alignment issues, we * only draw a divider if its bottom edge is @@ -5123,12 +5119,16 @@ static void materialui_render_menu_entry_playlist_desktop( /* Draw entry label */ if (!string_is_empty(entry_label)) { - char label_buf[NAME_MAX_LENGTH]; - - label_buf[0] = '\0'; - if (usable_width > 0) { + char label_buf[NAME_MAX_LENGTH]; + label_buf[0] = '\0'; + + /* Entry label is drawn at the vertical centre + * of the current node */ + int label_y = entry_y + (node->entry_height / 2.0f) + + mui->font_data.list.line_centre_offset; + /* Apply ticker */ if (mui->flags & MUI_FLAG_USE_SMOOTH_TICKER) { @@ -5157,7 +5157,7 @@ static void materialui_render_menu_entry_playlist_desktop( label_y, video_width, video_height, (entry_selected || touch_feedback_active) ? - mui->colors.list_text_highlighted : mui->colors.list_text, + mui->colors.list_text_highlighted : mui->colors.list_text, TEXT_ALIGN_LEFT, 1.0f, false, 0.0f, draw_text_outside); }