summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoichiro IWAO <meta@vmeta.jp>2017-07-04 19:41:59 +0900
committermetalefty <meta@vmeta.jp>2017-07-06 13:44:53 +0900
commitb83b5510f412c2c9f2d47640b6ccedfb916f85d6 (patch)
tree752f8256b271f283755bda370467300c618c6a57
parentc7d08bd9e7bcd00b11328537319ec7748a797574 (diff)
downloadxrdp-proprietary-b83b5510f412c2c9f2d47640b6ccedfb916f85d6.tar.gz
xrdp-proprietary-b83b5510f412c2c9f2d47640b6ccedfb916f85d6.zip
Fix Xvnc backend disconnects when some data copied to clipboard
Should fix #755.
-rw-r--r--xrdp/xrdp_mm.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c
index ba4227c2..1504f08f 100644
--- a/xrdp/xrdp_mm.c
+++ b/xrdp/xrdp_mm.c
@@ -3239,9 +3239,14 @@ server_send_to_channel(struct xrdp_mod *mod, int channel_id,
{
if (wm->mm->usechansrv)
{
- return 1;
+ /*
+ * Xvnc backend reaches here
+ * should not return 1 as this case is not an error
+ */
+ return 0;
}
+ /* vnc proxy mode reaches here */
return libxrdp_send_to_channel(wm->session, channel_id, data, data_len,
total_data_len, flags);
}