merge from 2.0-ongoing @ 3581

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

diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc
index 53389976598699089d5c216be4e4dd385b650e13..0b7c0f3d9e4cc658c0cbc2e2652b4a4c91bcfaf3 100644 (file)
--- a/libs/ardour/source_factory.cc
+++ b/libs/ardour/source_factory.cc
@@ -129,10 +129,12 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks)
        DataType type = DataType::AUDIO;
        const XMLProperty* prop = node.property("type");
 
-       if (prop) {
-               type = DataType(prop->value());
+       if (!prop) {
+               return boost::shared_ptr<Source>();
        }
 
+       type = DataType (prop->value());
+
        if (type == DataType::AUDIO) {
 
                try {