ardour/livetrax
13
0
Fork 0
Code

Fix problems when using the same menu item in both the track and xfade context menus. Fixes #3725.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8611 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-01-29 18:25:10 +00:00
parent 79c23f5a66
commit d3229b548b
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk2_ardour/editor.cc
View File

@ -1523,6 +1523,11 @@ Editor::build_track_region_context_menu ()
region_edit_menu_split_item = 0;
region_edit_menu_split_multichannel_item = 0;
/* we might try to use items that are currently attached to a crossfade menu,
so clear that, too.
*/
track_crossfade_context_menu.items().clear ();
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (clicked_axisview);
if (rtv) {
@ -1551,6 +1556,11 @@ Editor::build_track_crossfade_context_menu ()
MenuList& edit_items = track_crossfade_context_menu.items();
edit_items.clear ();
/* we might try to use items that are currently attached to a crossfade menu,
so clear that, too.
*/
track_region_context_menu.items().clear ();
AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (clicked_axisview);
if (atv) {
@ -1715,7 +1725,7 @@ Editor::add_region_context_items (Menu_Helpers::MenuList& edit_items, bool multi
}
if (_popup_region_menu_item == 0) {
_popup_region_menu_item = new MenuItem (menu_item_name);
_popup_region_menu_item = manage (new MenuItem (menu_item_name));
_popup_region_menu_item->set_submenu (*dynamic_cast<Menu*> (ActionManager::get_widget (X_("/PopupRegionMenu"))));
_popup_region_menu_item->show ();
} else {