fix crash at session close/exit if a midi-control-surface is used

[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 08fdb96e0d7a6c24c0ff70a547f8ae87d18c590c..c2d6cb087a6a36ced0e2bb0719031ef7a03fc0e9 100644 (file)
--- a/libs/ardour/export_profile_manager.cc
+++ b/libs/ardour/export_profile_manager.cc
@@ -34,7 +34,7 @@
 
 #include "ardour/export_profile_manager.h"
 #include "ardour/export_format_specification.h"
-#include "ardour/export_formats_search_path.h"
+#include "ardour/search_paths.h"
 #include "ardour/export_timespan.h"
 #include "ardour/export_channel_configuration.h"
 #include "ardour/export_filename.h"
@@ -114,17 +114,22 @@ ExportProfileManager::ExportProfileManager (Session & s, ExportType type)
 
 ExportProfileManager::~ExportProfileManager ()
 {
-       XMLNode * instant_xml (new XMLNode (xml_node_name));
-       serialize_profile (*instant_xml);
-       session.add_instant_xml (*instant_xml, false);
+       XMLNode * extra_xml (new XMLNode (xml_node_name));
+       serialize_profile (*extra_xml);
+       session.add_extra_xml (*extra_xml);
 }
 
 void
 ExportProfileManager::load_profile ()
 {
-       XMLNode * instant_node = session.instant_xml (xml_node_name);
-       if (instant_node) {
-               set_state (*instant_node);
+       XMLNode * extra_node = session.extra_xml (xml_node_name);
+       /* Legacy sessions used Session instant.xml for this */
+       if (!extra_node) {
+               extra_node = session.instant_xml (xml_node_name);
+       }
+
+       if (extra_node) {
+               set_state (*extra_node);
        } else {
                XMLNode empty_node (xml_node_name);
                set_state (empty_node);
@@ -332,8 +337,7 @@ ExportProfileManager::find_file (std::string const & pattern)
 {
        vector<std::string> found;
 
-       Glib::PatternSpec pattern_spec (pattern);
-       find_matching_files_in_search_path (search_path, pattern_spec, found);
+       find_files_matching_pattern (found, search_path, pattern);
 
        return found;
 }
@@ -644,6 +648,7 @@ ExportProfileManager::get_new_format (ExportFormatSpecPtr original)
        ExportFormatSpecPtr format;
        if (original) {
                format.reset (new ExportFormatSpecification (*original));
+               std::cerr << "After new format created from original, format has id [" << format->id().to_s() << ']' << std::endl;
        } else {
                format = handler->add_format();
                format->set_name (_("empty format"));