Skip to content

Commit

Permalink
#1167: when the client disables the clipboard, make sure we disable a…
Browse files Browse the repository at this point in the history
…ll the selections so that we don't try to request data from the client, which would fail and timeout

git-svn-id: https://xpra.org/svn/Xpra/trunk@12495 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Apr 30, 2016
1 parent e5cb17a commit 6d77582
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/xpra/server/server_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2270,7 +2270,8 @@ def _process_clipboard_enabled_status(self, proto, packet):
self.set_clipboard_enabled_status(ss, clipboard_enabled)

def set_clipboard_enabled_status(self, ss, clipboard_enabled):
if not self._clipboard_helper:
ch = self._clipboard_helper
if not ch:
clipboardlog.warn("Warning: client try to toggle clipboard-enabled status,")
clipboardlog.warn(" but we do not support clipboard at all! Ignoring it.")
return
Expand All @@ -2279,6 +2280,8 @@ def set_clipboard_enabled_status(self, ss, clipboard_enabled):
clipboardlog.warn("Warning: received a request to change the clipboard status,")
clipboardlog.warn(" but it does not come from the clipboard owner! Ignoring it.")
cc.clipboard_enabled = clipboard_enabled
if not clipboard_enabled:
ch.enable_selections([])
clipboardlog("toggled clipboard to %s for %s", clipboard_enabled, ss.protocol)

def _process_keyboard_sync_enabled_status(self, proto, packet):
Expand Down

0 comments on commit 6d77582

Please sign in to comment.