Skip to content

Commit

Permalink
#2403 don't disable the clipboard when we get many requests
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@23723 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Sep 6, 2019
1 parent b0b59ab commit d27f6d1
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions src/xpra/server/source/clipboard_connection.py
Expand Up @@ -10,7 +10,7 @@
from xpra.net.compression import Compressible, compressed_wrapper
from xpra.server.source.stub_source_mixin import StubSourceMixin
from xpra.platform.features import CLIPBOARDS
from xpra.util import envint, XPRA_CLIPBOARD_NOTIFICATION_ID
from xpra.util import envint
from xpra.os_util import monotonic_time
from xpra.log import Logger

Expand Down Expand Up @@ -118,14 +118,6 @@ def send_clipboard(self, packet):
log("%i events in the last %i seconds: %s", len(events), MAX_CLIPBOARD_LIMIT_DURATION, events)
if len(events)>=MAX_CLIPBOARD_LIMIT*MAX_CLIPBOARD_LIMIT_DURATION:
log.warn(" limit sustained for more than %i seconds,", MAX_CLIPBOARD_LIMIT_DURATION)
log.warn(" the clipboard is now disabled")
self.clipboard_enabled = False
body = "Too many clipboard requests,\n"+\
"a clipboard synchronization loop may be causing this problem,\n"+\
"or an overly aggressive clipboard manager perhaps?"
self.send_clipboard_enabled(msg)
self.may_notify(XPRA_CLIPBOARD_NOTIFICATION_ID,
"Clipboard synchronization is now disabled", body, icon_name="clipboard")
return
#call compress_clibboard via the encode work queue:
self.queue_encode((True, self.compress_clipboard, packet))
Expand Down

0 comments on commit d27f6d1

Please sign in to comment.