mark the step entry dialog as a dialog even though it is an ArdourWindow, to help...

[ardour.git] / gtk2_ardour / automation_streamview.cc

diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc
index 3e2046fd58183e5d800cd802528959afd5c6c818..e477b7ce728f598de03d56032a4c557633acae0f 100644 (file)
--- a/gtk2_ardour/automation_streamview.cc
+++ b/gtk2_ardour/automation_streamview.cc
@@ -26,7 +26,6 @@
 
 #include "ardour/midi_region.h"
 #include "ardour/midi_source.h"
-#include "ardour/region_factory.h"
 
 #include "automation_streamview.h"
 #include "region_view.h"
@@ -95,8 +94,9 @@ AutomationStreamView::add_region_view_internal (boost::shared_ptr<Region> region
                        /* great. we already have an AutomationRegionView for this Region. use it again. */
                        AutomationRegionView* arv = dynamic_cast<AutomationRegionView*>(*i);;
 
-                       if (arv->line())
+                       if (arv->line()) {
                                arv->line()->set_list (list);
+                       }
                        (*i)->set_valid (true);
                        (*i)->enable_display(wfd);
                        display_region(arv);
@@ -249,9 +249,10 @@ AutomationStreamView::interpolation () const
        }
 
        AutomationRegionView* v = dynamic_cast<AutomationRegionView*> (region_views.front());
-       assert (v);
-
-       return v->line()->the_list()->interpolation ();
+       if (v) {
+               return v->line()->the_list()->interpolation ();
+       }
+       return AutomationList::Linear;
 }
 
 /** Clear all automation displayed in this view */