diff options
| author | Robin Gareus <robin@gareus.org> | 2017-08-16 05:02:26 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-08-16 05:23:13 +0200 |
| commit | 24cb141aa67d9aee85b4ea9b78b2347432a41ecd (patch) | |
| tree | 9c51a8ff8e92df36e57ba6fddda0eef6e39665cb /gtk2_ardour/ardour_ui.cc | |
| parent | bd40b9132cbac2d2b79ba0ef480bd41d837f8f71 (diff) | |
Revert "Revert ongoing SessionDialog changes for 5.11 release."
This reverts commit bd40b9132cbac2d2b79ba0ef480bd41d837f8f71.
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 3425ab1bb1..90c9b9cf29 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -3287,18 +3287,12 @@ ARDOUR_UI::build_session_from_dialog (SessionDialog& sd, const std::string& sess if (nsm) { bus_profile.master_out_channels = 2; } else { - /* get settings from advanced section of NSD */ - - if (sd.create_master_bus()) { - bus_profile.master_out_channels = (uint32_t) sd.master_channel_count(); - } else { - bus_profile.master_out_channels = 0; - } - + bus_profile.master_out_channels = (uint32_t) sd.master_channel_count(); } - if (build_session (session_path, session_name, &bus_profile)) { + // NULL profile: no master, no monitor + if (build_session (session_path, session_name, bus_profile.master_out_channels > 0 ? &bus_profile : NULL)) { return -1; } |