Changeset 1579

Timestamp:

01/19/12 07:39:04 (16 months ago)

Author:

philmoz

Message:

Fix to right button to active sub-menus stored in modules (thx pelrun)
​http://chdk.setepontos.com/index.php?topic=847.msg80133#msg80133

File:

• trunk/core/gui_menu.c (modified) (3 diffs)

trunk/core/gui_menu.c

@@ -352 +352 @@
 }
 
+// Call a function to process a menu item (may be a sub-menu loaded via a module)
+static void select_proc()
+{
+    if (curr_menu->menu[gui_menu_curr_item].value)
+    {
+        ((void (*)(int arg))(curr_menu->menu[gui_menu_curr_item].value))(curr_menu->menu[gui_menu_curr_item].arg);
+        if (curr_menu->on_change)
+        {
+            curr_menu->on_change(gui_menu_curr_item);
+        }
+        //gui_menu_set_curr_menu(curr_menu, 0, 0); // restore this if it causes problems
+        gui_menu_redraw=2;
+    }
+}
+
 // Move up / down in menu, adjusting scroll position if needed
 //   increment = -1 to move up, 1 to move down
@@ -499 +514 @@
                         update_enum_value(1);
                         break;
+                    case MENUITEM_SUBMENU_PROC:
+                        select_proc();
+                        break;
                     case MENUITEM_SUBMENU:
                         select_sub_menu();
@@ -520 +538 @@
                     case MENUITEM_SUBMENU_PROC:
                     case MENUITEM_PROC:
-                        if (curr_menu->menu[gui_menu_curr_item].value)
-                        {
-                            ((void (*)(int arg))(curr_menu->menu[gui_menu_curr_item].value))(curr_menu->menu[gui_menu_curr_item].arg);
-                            if (curr_menu->on_change)
-                            {
-                                curr_menu->on_change(gui_menu_curr_item);
-                            }
-                            //gui_menu_set_curr_menu(curr_menu, 0, 0); // restore this if it causes problems
-                            gui_menu_redraw=2;
-                        }
+                        select_proc();
                         break;
                     case MENUITEM_SUBMENU: