ardour/livetrax
13
0
Fork 0
Code

Fix disappearing plugin menu (#3182)

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7163 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-05-25 23:39:44 +00:00
parent f7bff95fbc
commit c8376522b1
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk2_ardour/midi_time_axis.h
View File

@ -108,10 +108,7 @@ class MidiTimeAxisView : public RouteTimeAxisView
void route_active_changed ();
void add_insert_to_subplugin_menu (ARDOUR::Processor *);
bool _ignore_signals;
Gtk::Menu _subplugin_menu;
MidiScroomer* _range_scroomer;
PianoRollHeader* _piano_roll_header;
ARDOUR::NoteMode _note_mode;

10
gtk2_ardour/route_time_axis.cc
View File

@ -392,6 +392,12 @@ RouteTimeAxisView::build_automation_action_menu ()
{
using namespace Menu_Helpers;
/* detach subplugin_menu from automation_action_menu before we delete automation_action_menu,
otherwise bad things happen (see comment for similar case in MidiTimeAxisView::build_automation_action_menu)
*/
detach_menu (subplugin_menu);
delete automation_action_menu;
automation_action_menu = new Menu;
@ -408,9 +414,9 @@ RouteTimeAxisView::build_automation_action_menu ()
items.push_back (MenuElem (_("Hide All Automation"),
sigc::mem_fun(*this, &RouteTimeAxisView::hide_all_automation)));
/* attach the plugin submenu. It may have previously been used elsewhere, so we detach it first. */
/* Attach the plugin submenu. It may have previously been used elsewhere,
so it was detached above */
detach_menu (subplugin_menu);
items.push_back (MenuElem (_("Plugins"), subplugin_menu));
items.back().set_sensitive (!subplugin_menu.items().empty());
}