aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/word.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/word.cpp b/src/word.cpp
index 2876ddfb..1ea22931 100644
--- a/src/word.cpp
+++ b/src/word.cpp
@@ -695,7 +695,16 @@ const string word::getConvertedText(const charset& dest) const
{
string out;
- charset::convert(m_buffer, out, m_charset, dest);
+ try
+ {
+ charset::convert(m_buffer, out, m_charset, dest);
+ }
+ catch (vmime::exceptions::charset_conv_error& e)
+ {
+ // Do not fail if charset is not recognized:
+ // copy 'word' as raw text
+ out = m_buffer;
+ }
return (out);
}