more waveform drawing/coloring changes

[ardour.git] / gtk2_ardour / add_route_dialog.cc

diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index f5f4c62dac0b5ed413caa19b7bed677e2b0ce24a..e0e5c70798527b59c17779df714766d8a0264b54 100644 (file)
--- 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,10 +57,7 @@ AddRouteDialog::AddRouteDialog (Session* s)
        , mode_label (_("Track mode:"))
        , instrument_label (_("Instrument:"))
 {
-       set_session (s);
-
        set_name ("AddRouteDialog");
-       set_position (Gtk::WIN_POS_MOUSE);
        set_modal (true);
        set_skip_taskbar_hint (true);
        set_resizable (false);
@@ -497,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;
        }
 
@@ -514,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);
 }
@@ -535,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);
                }