Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2014-02-23 23:38:29 +0400
committerJens Verwiebe <info@jensverwiebe.de>2014-02-23 23:38:29 +0400
commit8be628cf7f732c53bc73f479815346d352bae16a (patch)
treee494f5a58722b125ef344c9a19052fc7c0ecad99 /intern/locale
parentd92f6b9903c8b914523ef7b3aa228a11f34bd605 (diff)
Fix an uncaught exception on OSX, perhaps general with popups
Diffstat (limited to 'intern/locale')
-rw-r--r--intern/locale/boost_locale_wrapper.cpp3
1 files changed, 3 insertions, 0 deletions
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<Facet>(loc) == false */
+ return msgid;
+ }
catch(std::exception const &) {
// std::cout << "bl_locale_pgettext(" << msgctxt << ", " << msgid << "): " << e.what() << " \n";
return msgid;