* grub-core/gfxmenu/gui_list.c (draw_menu): Don't use set in if.

diff --git a/ChangeLog b/ChangeLog
index 3ba8b300412c7ee1c18e99067a535e41ce4dd510..6c69ba780281df6f31eed57ca5727a99e0d5f6db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/gfxmenu/gui_list.c (draw_menu): Don't use set in if.
+
 2011-12-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/efi/api.h (grub_efi_memory_descriptor): Add packed

diff --git a/grub-core/gfxmenu/gui_list.c b/grub-core/gfxmenu/gui_list.c
index 2ff6e0f973b6640997b4f0882a1a7b97b9661c4d..1982d9a40d256bacbbea57eb2da84f745302e0b3 100644 (file)
--- a/grub-core/gfxmenu/gui_list.c
+++ b/grub-core/gfxmenu/gui_list.c
@@ -245,6 +245,7 @@ draw_menu (list_impl_t self, int num_shown_items)
        visible_index++, menu_index++)
     {
       int is_selected = (menu_index == self->view->selected);
+      struct grub_video_bitmap *icon;
 
       if (is_selected)
         {
@@ -256,8 +257,8 @@ draw_menu (list_impl_t self, int num_shown_items)
                         item_top - sel_toppad);
         }
 
-      struct grub_video_bitmap *icon;
-      if ((icon = get_item_icon (self, menu_index)) != 0)
+      icon = get_item_icon (self, menu_index);
+      if (icon != 0)
         grub_video_blit_bitmap (icon, GRUB_VIDEO_BLIT_BLEND,
                                 sel_leftpad,
                                 item_top + (item_height - self->icon_height) / 2,