1 files changed, 27 insertions, 3 deletions

diff --git a/apps/menus/plugin_menu.c b/apps/menus/plugin_menu.c
index 055cfce140..7f29e61af4 100644
--- a/apps/menus/plugin_menu.c
+++ b/apps/menus/plugin_menu.c
@@ -24,11 +24,12 @@
 #include "config.h"
 #include "lang.h"
 #include "menu.h"
+#include "action.h"
 #include "settings.h"
 #include "rbpaths.h"
 #include "root_menu.h"
 #include "tree.h"
-
+static int reenter = 0;
 
 enum {
     GAMES,
@@ -53,13 +54,36 @@ static int plugins_menu(void* param)
 
     browse_context_init(&browse, SHOW_PLUGINS, 0, str(items[item].id),
                          Icon_Plugin, items[item].path, NULL);
-                        
+
     ret = rockbox_browse(&browse);
+
     if (ret == GO_TO_PREVIOUS)
         return 0;
+    if (ret == GO_TO_PLUGIN)
+        reenter = 1;
     return ret;
 }
 
+static int menu_callback(int action,
+                         const struct menu_item_ex *this_item,
+                         struct gui_synclist *this_list)
+{
+    (void)this_item;
+    static int selected = 0;
+
+    if (action == ACTION_ENTER_MENUITEM)
+    {
+        this_list->selected_item = selected;
+        if (reenter-- > 0)
+            action = ACTION_STD_OK;
+    }
+    else if (action == ACTION_STD_OK)
+    {
+        selected = gui_synclist_get_sel_pos(this_list);
+    }
+    return action;
+}
+
 #define ITEM_FLAG (MENU_FUNC_USEPARAM|MENU_FUNC_CHECK_RETVAL)
 
 MENUITEM_FUNCTION(games_item, ITEM_FLAG, ID2P(LANG_PLUGIN_GAMES), 
@@ -69,6 +93,6 @@ MENUITEM_FUNCTION(apps_item,  ITEM_FLAG, ID2P(LANG_PLUGIN_APPS),
 MENUITEM_FUNCTION(demos_item, ITEM_FLAG, ID2P(LANG_PLUGIN_DEMOS), 
                   plugins_menu, (void*)DEMOS, NULL, Icon_Folder);
 
-MAKE_MENU(plugin_menu, ID2P(LANG_PLUGINS), NULL,
+MAKE_MENU(plugin_menu, ID2P(LANG_PLUGINS), &menu_callback,
           Icon_Plugin,
           &games_item, &apps_item, &demos_item);