From 0a43a0fb6ae0c0bc3f77d58ced8447b623359191 Mon Sep 17 00:00:00 2001 From: John Emmas Date: Sat, 10 May 2014 08:35:27 +0100 Subject: [PATCH] Bug fix imported from Mixbus2 (SVN r11025) Fix a crashing bug when trying to launch in a non-English locale (possibly only affects Windows) --- libs/ardour/globals.cc | 1 + libs/gtkmm2ext/utils.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 3094dc1fdf..03941e61fc 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -244,6 +244,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 4c85f1928d..d3a593a68f 100644 --- 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 }