Fix possible segfault in multi-bus AUs.

[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 717f1e305c43cf455b9b2f69ec514f2d3e4f5c21..94099faa262aa367d39b1a89da541e5902e4feba 100644 (file)
--- a/libs/ardour/export_profile_manager.cc
+++ b/libs/ardour/export_profile_manager.cc
@@ -48,7 +48,7 @@
 #include "ardour/session.h"
 #include "ardour/broadcast_info.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Glib;
@@ -58,7 +58,7 @@ namespace ARDOUR
 {
 
 ExportProfileManager::ExportProfileManager (Session & s, ExportType type)
-  : type(type)
+  : _type(type)
   , handler (s.get_export_handler())
   , session (s)
 
@@ -162,7 +162,7 @@ ExportProfileManager::prepare_for_export ()
                        }
 
                        // ...and each channel config
-                       filename->include_channel_config = (type == StemExport) ||
+                       filename->include_channel_config = (_type == StemExport) ||
                                                           (channel_configs.size() > 1);
                        for(ChannelConfigStateList::iterator cc_it = channel_configs.begin(); cc_it != channel_configs.end(); ++cc_it) {
                                handler->add_export_config (*ts_it, (*cc_it)->config, (*format_it)->format, filename, b);
@@ -180,9 +180,14 @@ ExportProfileManager::load_preset (ExportPresetPtr preset)
        if (!preset) { return false; }
 
        XMLNode const * state;
+       /* local state is saved in instant.xml and contains timespan
+        * and channel config for per session.
+        * It may not be present for a given preset/session combination
+        * and is never preset for system-wide presets, but that's OK.
+        */
        if ((state = preset->get_local_state())) {
                set_local_state (*state);
-       } else { ok = false; }
+       }
 
        if ((state = preset->get_global_state())) {
                if (!set_global_state (*state)) {
@@ -584,9 +589,9 @@ ExportProfileManager::save_format_to_disk (ExportFormatSpecPtr format)
        string new_name = format->name();
        new_name += export_format_suffix;
 
-        /* make sure its legal for the filesystem */
+       /* make sure its legal for the filesystem */
 
-        new_name = legalize_for_path (new_name);
+       new_name = legalize_for_path (new_name);
 
        std::string new_path = Glib::build_filename (export_config_dir, new_name);
 
@@ -628,7 +633,6 @@ ExportProfileManager::save_format_to_disk (ExportFormatSpecPtr format)
                tree.write();
        }
 
-       FormatListChanged ();
        return new_path;
 }
 
@@ -873,10 +877,9 @@ ExportProfileManager::get_warnings ()
 
 void
 ExportProfileManager::check_config (boost::shared_ptr<Warnings> warnings,
-                                   TimespanStatePtr timespan_state,
-                                   ChannelConfigStatePtr channel_config_state,
-                                   FormatStatePtr format_state,
-                                   FilenameStatePtr filename_state)
+                                    TimespanStatePtr timespan_state,
+                                    ChannelConfigStatePtr channel_config_state,
+                                    FormatStatePtr format_state, FilenameStatePtr filename_state)
 {
        TimespanListPtr timespans = timespan_state->timespans;
        ExportChannelConfigPtr channel_config = channel_config_state->config;