diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-05-04 22:02:05 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-05-04 22:02:05 -0400 |
| commit | 40944574c620868b43872f64600a8a42d382a6a1 (patch) | |
| tree | ea1eda6147b34afdfccf4882d99602b0565fd944 /gtk2_ardour/add_route_dialog.cc | |
| parent | 69a3310037e013c074b1d8643323017ac1c815f9 (diff) | |
the big rework of window management. probably not complete at thsi point, but this is mostly functional
Diffstat (limited to 'gtk2_ardour/add_route_dialog.cc')
| -rw-r--r-- | gtk2_ardour/add_route_dialog.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index d039f67c0e..e0e5c70798 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/gtk2_ardour/add_route_dialog.cc @@ -49,7 +49,7 @@ using namespace ARDOUR; std::vector<std::string> AddRouteDialog::channel_combo_strings; -AddRouteDialog::AddRouteDialog (Session* s) +AddRouteDialog::AddRouteDialog () : ArdourDialog (_("Add Track or Bus")) , routes_adjustment (1, 1, 128, 1, 4) , routes_spinner (routes_adjustment) @@ -57,8 +57,6 @@ AddRouteDialog::AddRouteDialog (Session* s) , mode_label (_("Track mode:")) , instrument_label (_("Instrument:")) { - set_session (s); - set_name ("AddRouteDialog"); set_modal (true); set_skip_taskbar_hint (true); @@ -496,7 +494,7 @@ AddRouteDialog::add_route_group (RouteGroup* g) RouteGroup* AddRouteDialog::route_group () { - if (route_group_combo.get_active_row_number () == 2) { + if (!_session || route_group_combo.get_active_row_number () == 2) { return 0; } @@ -513,7 +511,9 @@ AddRouteDialog::refill_route_groups () route_group_combo.append_text (_("No Group")); - _session->foreach_route_group (sigc::mem_fun (*this, &AddRouteDialog::add_route_group)); + if (_session) { + _session->foreach_route_group (sigc::mem_fun (*this, &AddRouteDialog::add_route_group)); + } route_group_combo.set_active (2); } @@ -534,7 +534,9 @@ AddRouteDialog::group_changed () delete g; route_group_combo.set_active (2); } else { - _session->add_route_group (g); + if (_session) { + _session->add_route_group (g); + } add_route_group (g); route_group_combo.set_active (3); } |