summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/midi_patch_manager.h
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2015-01-10 19:31:50 +0100
committerRobin Gareus <robin@gareus.org>2015-01-10 19:31:50 +0100
commit38c2bdc856ce9c57264b063ee943887bc4725ba6 (patch)
treeb8cd2a1bd820da4fbbc9a9ab8df42db00342ae85 /libs/ardour/ardour/midi_patch_manager.h
parent44203ce955f33135065456f55f1f685131174ba6 (diff)
gracefully handle missing .midnam
Fixes bug: Add a .midnam to local preferences. use it in a session. delete the .midnam, reload session -> crash
Diffstat (limited to 'libs/ardour/ardour/midi_patch_manager.h')
-rw-r--r--libs/ardour/ardour/midi_patch_manager.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/ardour/ardour/midi_patch_manager.h b/libs/ardour/ardour/midi_patch_manager.h
index 1b7de6a51d..5ed648b3e7 100644
--- a/libs/ardour/ardour/midi_patch_manager.h
+++ b/libs/ardour/ardour/midi_patch_manager.h
@@ -126,10 +126,11 @@ public:
std::list<std::string> custom_device_mode_names_by_model(std::string model_name) {
if (model_name != "") {
- return master_device_by_model(model_name)->custom_device_mode_names();
- } else {
- return std::list<std::string>();
+ if (master_device_by_model(model_name)) {
+ return master_device_by_model(model_name)->custom_device_mode_names();
+ }
}
+ return std::list<std::string>();
}
const MasterDeviceNames::Models& all_models() const { return _all_models; }