From ec197c441e5a78d19092bce66fb59a437627540f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= Date: Sat, 6 Jun 2020 20:03:21 -0300 Subject: [PATCH] ozone: Move some menu_entry_get*() calls to a better place menu_entry_get*() was getting called even for entries that wouldn't be displayed. --- menu/drivers/ozone/ozone_entries.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/menu/drivers/ozone/ozone_entries.c b/menu/drivers/ozone/ozone_entries.c index e71a52bd4e..0951f43144 100644 --- a/menu/drivers/ozone/ozone_entries.c +++ b/menu/drivers/ozone/ozone_entries.c @@ -574,8 +574,6 @@ border_iterate: menu_entry_init(&entry); entry.path_enabled = false; entry.label_enabled = false; - menu_entry_get(&entry, 0, (unsigned)i, selection_buf, true); - menu_entry_get_value(&entry, &entry_value); if (!node) continue; @@ -585,6 +583,9 @@ border_iterate: else if (y + scroll_y - node->height - 20 * scale_factor > bottom_boundary) goto icons_iterate; + menu_entry_get(&entry, 0, (unsigned)i, selection_buf, true); + menu_entry_get_value(&entry, &entry_value); + /* Prepare text */ menu_entry_get_rich_label(&entry, &entry_rich_label);