From 2def4652562278b63e608b4a762ed1daee76db3b Mon Sep 17 00:00:00 2001 From: Andrey Batyiev Date: Thu, 15 Jul 2021 09:03:57 +0300 Subject: [PATCH] Synergy 1081 synergy1. buffer was not updated in case user copies on server and then copies on client and paste (#7058) * SYNERGY-1050 Synergy1. Floating issue. User is not able to paste to client in some cases *Fix copy paste logic, when OS reported about clipboard update too late * SYNERGY-1050 Synergy1. Floating issue. User is not able to paste to client in some cases Update changelog * SYNERGY-1081 Synergy1. Buffer was not updated in case user copies on server and then copies on client and paste Fix server assert when client updating clipboard Co-authored-by: Andrii Batyiev --- ChangeLog | 2 +- src/lib/server/Server.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1318c2b4..23d4e3709 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,7 +11,7 @@ Bug fixes: - #7036 Fix tray icon not changing theme on Big Sur - #7046 Fix MacOS 10.13 build - #7049 Scroll doesn't work in case of macOS is server -- #7057 Fix copy paste logic, when OS reported about clipboard update too late +- #7057 | #7058 Fix copy paste logic, when OS reported about clipboard update too late - #7055 Add secure input notification on Linux - #7052 Add secure input notification on Windows - #7047 Fix prevent sleep option on Mac and Windows diff --git a/src/lib/server/Server.cpp b/src/lib/server/Server.cpp index 7ed4bfd80..aebb82496 100644 --- a/src/lib/server/Server.cpp +++ b/src/lib/server/Server.cpp @@ -1303,7 +1303,7 @@ Server::handleClipboardGrabbed(const Event& event, void* vclient) } } - if (m_active != m_primaryClient) { + if (grabber == m_primaryClient && m_active != m_primaryClient) { LOG((CLOG_INFO "clipboard grabbed, but we are already changed active screen. Resend clipboard data")); for (ClipboardID id = 0; id < kClipboardEnd; ++id) { onClipboardChanged(m_primaryClient, id, m_clipboards[id].m_clipboardSeqNum);