Fix generic-midi controllable race-condition

[ardour.git] / gtk2_ardour / luainstance.cc

diff --git a/gtk2_ardour/luainstance.cc b/gtk2_ardour/luainstance.cc
index bc5c1b0e6d5066a92a990e13133faceaea3a9202..a3349165396d916ed42ce0aac6349feeaf8ede79 100644 (file)
--- a/gtk2_ardour/luainstance.cc
+++ b/gtk2_ardour/luainstance.cc
@@ -446,7 +446,7 @@ lua_actionlist (lua_State *L)
        vector<string> tooltips;
        vector<string> keys;
        vector<Glib::RefPtr<Gtk::Action> > actions;
-       Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
+       ActionManager::get_all_actions (paths, labels, tooltips, keys, actions);
 
        vector<string>::iterator p;
        vector<string>::iterator l;
@@ -472,24 +472,18 @@ lua_actionlist (lua_State *L)
                        continue;
                if (parts[1] == _("redirectmenu"))
                        continue;
-               if (parts[1] == _("Editor_menus"))
-                       continue;
                if (parts[1] == _("RegionList"))
                        continue;
                if (parts[1] == _("ProcessorMenu"))
                        continue;
 
-               /* strip <Actions>/ from the start */
-               string path = (*p);
-               path = path.substr (strlen ("<Actions>/"));
-
                if (!action_tbl[parts[1]].isTable()) {
                        action_tbl[parts[1]] = luabridge::newTable (L);
                }
                assert (action_tbl[parts[1]].isTable());
                luabridge::LuaRef tbl (action_tbl[parts[1]]);
                assert (tbl.isTable());
-               tbl[*l] = path;
+               tbl[*l] = *p;
        }
 
        luabridge::push (L, action_tbl);