summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk2_ardour/export_channel_selector.cc6
-rw-r--r--libs/ardour/export_profile_manager.cc2
2 files changed, 6 insertions, 2 deletions
diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc
index 6f32ae783e..10e3135b53 100644
--- a/gtk2_ardour/export_channel_selector.cc
+++ b/gtk2_ardour/export_channel_selector.cc
@@ -110,8 +110,10 @@ PortExportChannelSelector::fill_route_list ()
/* Add master bus and then everything else */
- ARDOUR::IO* master = _session->master_out()->output().get();
- channel_view.add_route (master);
+ if (_session->master_out()) {
+ ARDOUR::IO* master = _session->master_out()->output().get();
+ channel_view.add_route (master);
+ }
for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) {
if ((*it)->is_master () || (*it)->is_monitor ()) {
diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc
index deeb3aea2b..388ffe2508 100644
--- a/libs/ardour/export_profile_manager.cc
+++ b/libs/ardour/export_profile_manager.cc
@@ -501,6 +501,8 @@ ExportProfileManager::init_channel_configs (XMLNodeList nodes)
channel_configs.push_back (config);
// Add master outs as default
+ if (!session.master_out()) { return false; }
+
IO* master_out = session.master_out()->output().get();
if (!master_out) { return false; }