Commit: 8be628cf7f732c53bc73f479815346d352bae16a
Author: Jens Verwiebe
Date: Sun Feb 23 20:38:29 2014 +0100
https://developer.blender.org/rB8be628cf7f732c53bc73f479815346d352bae16a
Fix an uncaught exception on OSX, perhaps general with popups
===================================================================
M intern/locale/boost_locale_wrapper.cpp
===================================================================
diff --git a/intern/locale/boost_locale_wrapper.cpp
b/intern/locale/boost_locale_wrapper.cpp
index 945d0bb..4d429f4 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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
