aboutsummaryrefslogtreecommitdiffstats
path: root/vncviewer
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2013-05-24 10:50:26 +0000
committerPierre Ossman <ossman@cendio.se>2013-05-24 10:50:26 +0000
commit7edfb86c659d9fdd0c243df038e513ebaccf19b7 (patch)
tree5c7b7ac890e1ab4a634934549afa0cab1a1f585f /vncviewer
parentb77b0b2d2895f979e47794d58dd70124d8981642 (diff)
downloadtigervnc-7edfb86c659d9fdd0c243df038e513ebaccf19b7.tar.gz
tigervnc-7edfb86c659d9fdd0c243df038e513ebaccf19b7.zip
Copy r5112 from trunk.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1_3@5114 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'vncviewer')
-rw-r--r--vncviewer/CConn.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/vncviewer/CConn.cxx b/vncviewer/CConn.cxx
index 97e35ba0..4aeb03f1 100644
--- a/vncviewer/CConn.cxx
+++ b/vncviewer/CConn.cxx
@@ -350,6 +350,9 @@ void CConn::serverCutText(const char* str, rdr::U32 len)
char *buffer;
int size, ret;
+ if (!acceptClipboard)
+ return;
+
size = fl_utf8froma(NULL, 0, str, len);
if (size <= 0)
return;