diff --git a/src/lib/platform/OSXClipboardHTMLConverter.cpp b/src/lib/platform/OSXClipboardHTMLConverter.cpp
index 03caaa09b..462bb93fd 100644
--- a/src/lib/platform/OSXClipboardHTMLConverter.cpp
+++ b/src/lib/platform/OSXClipboardHTMLConverter.cpp
@@ -83,13 +83,18 @@ OSXClipboardHTMLConverter::convertString(
String
OSXClipboardHTMLConverter::doFromIClipboard(const String& data) const
{
- return convertString(data, kCFStringEncodingUTF8,
- CFStringGetSystemEncoding());
+ return data;
}
String
OSXClipboardHTMLConverter::doToIClipboard(const String& data) const
{
- return convertString(data, CFStringGetSystemEncoding(),
- kCFStringEncodingUTF8);
+ if (Unicode::isUTF8(data))
+ {
+ return data;
+ }
+ else
+ {
+ return convertString(data, CFStringGetSystemEncoding(), kCFStringEncodingUTF8);
+ }
}