Add error check to region gain control point selection undo.
authornick_m <mainsbridge@gmail.com>
Sat, 3 Oct 2015 16:44:27 +0000 (03:44 +1100)
committernick_m <mainsbridge@gmail.com>
Mon, 19 Oct 2015 13:53:29 +0000 (00:53 +1100)
gtk2_ardour/selection.cc

index ac62201db3b6e36f553836632ecdc063a1a6613d..baf424669f48b47482810feb6779b1577d148295 100644 (file)
@@ -1424,7 +1424,6 @@ Selection::set_state (XMLNode const & node, int)
                                XMLProperty* prop_parameter = (*i)->property (X_("parameter"));
                                XMLProperty* prop_view_index = (*i)->property (X_("view-index"));
 
-                               assert (prop_type);
                                assert (prop_route_id);
                                assert (prop_alist_id);
                                assert (prop_parameter);
@@ -1456,6 +1455,10 @@ Selection::set_state (XMLNode const & node, int)
                                XMLProperty* prop_region_id = (*i)->property (X_("region-id"));
                                XMLProperty* prop_view_index = (*i)->property (X_("view-index"));
 
+                               if (!prop_region_id || !prop_view_index) {
+                                       continue;
+                               }
+
                                PBD::ID region_id (prop_region_id->value ());
                                RegionSelection rs;
                                editor->get_regionviews_by_id (region_id, rs);