Fix wrong while statement 57/48357/1
authorjinwoo.shin <jw0227.shin@samsung.com>
Fri, 18 Sep 2015 10:11:12 +0000 (19:11 +0900)
committerjinwoo.shin <jw0227.shin@samsung.com>
Fri, 18 Sep 2015 10:11:12 +0000 (19:11 +0900)
Change-Id: Ib939327c8281d5c6af517f80aa146bf08430b14d
Signed-off-by: jinwoo.shin <jw0227.shin@samsung.com>
src/view_action_menu.c

index 10362f1..76265fe 100644 (file)
@@ -457,7 +457,7 @@ static void _update_menu(struct _priv *priv)
        int i;
 
        i = 0;
-       while (buttons[i].id != BUTTON_INVALID && i < BUTTON_MAX) {
+       while (i < BUTTON_MAX && buttons[i].id != BUTTON_INVALID) {
                _update_button_state(priv->menu_btn[i], &buttons[i]);
                i++;
        }
@@ -495,7 +495,7 @@ static bool _draw_action_area(struct _priv *priv)
        elm_object_part_content_set(priv->menu, PART_MENU, table);
 
        i = 0;
-       while (buttons[i].id != BUTTON_INVALID && i < BUTTON_MAX) {
+       while (i < BUTTON_MAX && buttons[i].id != BUTTON_INVALID) {
                btn = util_add_button(priv->menu, NULL,
                                buttons[i].data[UNTOGGLE].text,
                                buttons[i].style);
@@ -750,7 +750,7 @@ static void _destroy(void *data)
        inputmgr_remove_callback(priv->base, &key_handler);
 
        i = 0;
-       while (priv->menu_btn[i] && i < BUTTON_MAX) {
+       while (i < BUTTON_MAX && priv->menu_btn[i]) {
                inputmgr_remove_callback(priv->menu_btn[i], &button_handler);
                i++;
        }