From 8be628cf7f732c53bc73f479815346d352bae16a Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Sun, 23 Feb 2014 20:38:29 +0100 Subject: Fix an uncaught exception on OSX, perhaps general with popups --- intern/locale/boost_locale_wrapper.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'intern/locale/boost_locale_wrapper.cpp') diff --git a/intern/locale/boost_locale_wrapper.cpp b/intern/locale/boost_locale_wrapper.cpp index 945d0bbc5da..4d429f4078d 100644 --- a/intern/locale/boost_locale_wrapper.cpp +++ b/intern/locale/boost_locale_wrapper.cpp @@ -113,6 +113,9 @@ const char *bl_locale_pgettext(const char *msgctxt, const char *msgid) return r; return msgid; } + catch(std::bad_cast) { /* std::bad_cast if std::has_facet(loc) == false */ + return msgid; + } catch(std::exception const &) { // std::cout << "bl_locale_pgettext(" << msgctxt << ", " << msgid << "): " << e.what() << " \n"; return msgid; -- cgit v1.2.3