SYNERGY-928 Wrong encoding form macOS
This commit is contained in:
parent
6ce20f689a
commit
2aebeaab62
1 changed files with 9 additions and 4 deletions
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue