fix crash when copy'ing latent plugins

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

diff --git a/libs/ardour/session_configuration.cc b/libs/ardour/session_configuration.cc
index f9f43ba4b2b0b5fadaaf0af3cd2c9f95e1dbcb5c..b8814711f376a856e6fea8df430cf9ceb8a89bbe 100644 (file)
--- a/libs/ardour/session_configuration.cc
+++ b/libs/ardour/session_configuration.cc
@@ -18,16 +18,19 @@
 */
 
 #include <glib.h>
-#include <glib/gstdio.h> /* for g_stat() */
+#include "pbd/gstdio_compat.h"
 #include <glibmm/miscutils.h> /* for build_filename() */
 
+#include "pbd/error.h"
 #include "pbd/file_utils.h"
+#include "pbd/locale_guard.h"
 #include "pbd/pathexpand.h"
 
 #include "ardour/types.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/session_configuration.h"
-#include "i18n.h"
+#include "ardour/utils.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -51,7 +54,7 @@ XMLNode&
 SessionConfiguration::get_state ()
 {
        XMLNode* root;
-       LocaleGuard lg (X_("POSIX"));
+       LocaleGuard lg;
 
        root = new XMLNode ("Ardour");
        root->add_child_nocopy (get_variables ());
@@ -64,7 +67,7 @@ XMLNode&
 SessionConfiguration::get_variables ()
 {
        XMLNode* node;
-       LocaleGuard lg (X_("POSIX"));
+       LocaleGuard lg;
 
        node = new XMLNode ("Config");
 
@@ -156,7 +159,7 @@ SessionConfiguration::load_state ()
 
                XMLNode* node;
                if (((node = find_named_node (root, X_("Config"))) != 0)) {
-                       LocaleGuard lg (X_("POSIX"));
+                       LocaleGuard lg;
                        set_variables(*node);
                        info << _("Loaded custom session defaults.") << endmsg;
                } else {