From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 24 May 2013 10:50:26 +0000 (+0000)
Subject: Copy r5112 from trunk.
X-Git-Tag: v1.3.0~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7edfb86c659d9fdd0c243df038e513ebaccf19b7;p=tigervnc.git

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 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;