Maybe fix assertion crash.

[ardour.git] / gtk2_ardour / marker_time_axis_view.cc

diff --git a/gtk2_ardour/marker_time_axis_view.cc b/gtk2_ardour/marker_time_axis_view.cc
index cbd363a0217f3170ccde70f30916ef4a1f43373a..e9a15fb5a5c732a4dd771b3be35fbe1220217f32 100644 (file)
--- a/gtk2_ardour/marker_time_axis_view.cc
+++ b/gtk2_ardour/marker_time_axis_view.cc
@@ -31,6 +31,7 @@
 #include "public_editor.h"
 #include "rgb_macros.h"
 #include "gui_thread.h"
+#include "ardour_ui.h"
 
 #include "i18n.h"
 
@@ -49,7 +50,7 @@ MarkerTimeAxisView::MarkerTimeAxisView(MarkerTimeAxis& tv)
        : _trackview (tv)
 {
        region_color = _trackview.color();
-       stream_base_color = Config->canvasvar_MarkerTrack.get();
+       stream_base_color = ARDOUR_UI::config()->canvasvar_MarkerTrack.get();
 
        canvas_group = new ArdourCanvas::Group (*_trackview.canvas_display);
 
@@ -58,7 +59,7 @@ MarkerTimeAxisView::MarkerTimeAxisView(MarkerTimeAxis& tv)
        canvas_rect->property_y1() = 0.0;
        canvas_rect->property_x2() = max_frames;
        canvas_rect->property_y2() = (double)20;
-       canvas_rect->property_outline_color_rgba() = Config->canvasvar_MarkerTrack.get();
+       canvas_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_MarkerTrack.get();
        canvas_rect->property_fill_color_rgba() = stream_base_color;
                   
        canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_marker_time_axis_view_event), canvas_rect, &_trackview));
@@ -90,17 +91,11 @@ MarkerTimeAxisView::~MarkerTimeAxisView()
                iter = next ;
        }
        
-       if(canvas_rect)
-       {
-               delete canvas_rect;
-               canvas_rect = 0 ;
-       }
-       
-       if(canvas_group)
-       {
-               delete canvas_group;
-               canvas_group = 0 ;
-       }
+       delete canvas_rect;
+       canvas_rect = 0 ;
+
+       delete canvas_group;
+       canvas_group = 0 ;
 }