From 6ce9efb11d01042c72044db98c6839db78bb4694 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 6 Dec 2016 22:55:50 +0100 Subject: Don't assume patch-banks are populated. --- gtk2_ardour/midi_time_axis.cc | 6 +++++- gtk2_ardour/patch_change.cc | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 97d7ae1727..84d88c8f9e 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -1133,9 +1133,13 @@ MidiTimeAxisView::build_patch_menu() if (!channel_name_set) { continue; } + const ChannelNameSet::PatchBanks& patch_banks = channel_name_set->patch_banks(); + if (patch_banks.size () == 0) { + continue; + } + Gtk::Menu& chan_menu = *manage(new Gtk::Menu()); - const ChannelNameSet::PatchBanks& patch_banks = channel_name_set->patch_banks(); if (patch_banks.size() > 1) { for (ChannelNameSet::PatchBanks::const_iterator bank = patch_banks.begin(); diff --git a/gtk2_ardour/patch_change.cc b/gtk2_ardour/patch_change.cc index 4006cbdf46..ee4165df4a 100644 --- a/gtk2_ardour/patch_change.cc +++ b/gtk2_ardour/patch_change.cc @@ -82,7 +82,7 @@ PatchChange::initialize_popup_menus() boost::shared_ptr channel_name_set = _info.get_patches (_patch->channel()); - if (!channel_name_set) { + if (!channel_name_set || channel_name_set->patch_banks().size () == 0) { return; } -- cgit v1.2.3