merge from 2.0-ongoing @ 3581

[ardour.git] / libs / ardour / region_factory.cc

diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc
index 84d816724054b699f1a4a0ac7458913736c85501..88925a7f1695b2216ba6dd38c1ab1c17804f12b1 100644 (file)
--- a/libs/ardour/region_factory.cc
+++ b/libs/ardour/region_factory.cc
@@ -72,7 +72,7 @@ RegionFactory::create (boost::shared_ptr<const Region> region)
 {
        boost::shared_ptr<const AudioRegion> ar;
        boost::shared_ptr<const MidiRegion> mr;
-       
+
        if ((ar = boost::dynamic_pointer_cast<const AudioRegion>(region)) != 0) {
                boost::shared_ptr<Region> ret (new AudioRegion (ar));
                /* pure copy constructor - no CheckNewRegion emitted */
@@ -101,7 +101,11 @@ boost::shared_ptr<Region>
 RegionFactory::create (Session& session, XMLNode& node, bool yn)
 {
        boost::shared_ptr<Region> r = session.XMLRegionFactory (node, yn);
-       CheckNewRegion (r);
+
+       if (r) {
+               CheckNewRegion (r);
+       }
+
        return r;
 }