diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-02 09:16:28 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-02 09:16:28 -0500 |
| commit | e7c47747286c16aa575456b07120e1e8e8271bd5 (patch) | |
| tree | 7b74a91fcf5685271f2b90d57a3658c4051dbe84 /libs/midi++2 | |
| parent | 393ff4015349318b404d9e799292ce194645df09 (diff) | |
| parent | b439b79813a562278e5fc9ac088e4ca1fbf9f6cb (diff) | |
Merge branch 'master' into cairocanvas
Diffstat (limited to 'libs/midi++2')
| -rw-r--r-- | libs/midi++2/midnam_patch.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/midi++2/midnam_patch.cc b/libs/midi++2/midnam_patch.cc index bf22792f70..bd8bbfc42d 100644 --- a/libs/midi++2/midnam_patch.cc +++ b/libs/midi++2/midnam_patch.cc @@ -542,7 +542,9 @@ MasterDeviceNames::channel_name_set_by_device_mode_and_channel(const std::string boost::shared_ptr<Patch> MasterDeviceNames::find_patch(const std::string& mode, uint8_t channel, const PatchPrimaryKey& key) { - return channel_name_set_by_device_mode_and_channel(mode, channel)->find_patch(key); + boost::shared_ptr<ChannelNameSet> cns = channel_name_set_by_device_mode_and_channel(mode, channel); + if (!cns) return boost::shared_ptr<Patch>(); + return cns->find_patch(key); } boost::shared_ptr<ChannelNameSet> |