Bug fix imported from Mixbus2 (SVN r11025)

Fix a crashing bug when trying to launch in a non-English locale (possibly only affects Windows)

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 8bee4ec9023cc0f8c4d4c098283ab8cc8a26ca6c..39bcd1b79e8c6249fecd8a7e2b13fa6117bbe8ee 100644 (file)
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -241,6 +241,7 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
 
 #ifdef ENABLE_NLS
        (void) bindtextdomain(PACKAGE, localedir);
+       (void) bind_textdomain_codeset (PACKAGE, "UTF-8");
 #endif
 
        SessionEvent::init_event_pool ();

diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc
index 4c85f1928de5d74d203ab1a1da69752f87882db8..d3a593a68f3f490876e4ab2f25c86fe173efd821 100644 (file)
--- a/libs/gtkmm2ext/utils.cc
+++ b/libs/gtkmm2ext/utils.cc
@@ -42,6 +42,7 @@ Gtkmm2ext::init (const char* localedir)
 {
 #ifdef ENABLE_NLS
        (void) bindtextdomain(PACKAGE, localedir);
+       (void) bind_textdomain_codeset (PACKAGE, "UTF-8");
 #endif
 }