Copy r5112 from trunk.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1_3@5114 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/vncviewer/CConn.cxx b/vncviewer/CConn.cxx
index 97e35ba0a052c4b077ce7b1b2279d6c0b39f1d30..4aeb03f1d4d8c809b60eaaac58e2781b42489736 100644 (file)
--- 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;