Merge branch 'cairocanvas' into windows+cc

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

diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc
index bc4b31e3244501ba8fc233faac52d017ccefe59a..7ff4282c74bcdea5ee64ff28ce57313689cda6bc 100644 (file)
--- a/libs/ardour/export_profile_manager.cc
+++ b/libs/ardour/export_profile_manager.cc
@@ -437,6 +437,10 @@ ExportProfileManager::deserialize_timespan (XMLNode & root)
                state->time_format = (TimeFormat) string_2_enum (prop->value(), TimeFormat);
        }
 
+       if (state->timespans->empty()) {
+               return TimespanStatePtr();
+       }
+
        return state;
 }
 
@@ -681,7 +685,7 @@ ExportProfileManager::FormatStatePtr
 ExportProfileManager::deserialize_format (XMLNode & root)
 {
        XMLProperty * prop;
-       UUID id;
+       PBD::UUID id;
 
        if ((prop = root.property ("id"))) {
                id = prop->value();