From 7b2026e376f3afb4dff49a27b8db985a5d7590fb Mon Sep 17 00:00:00 2001 From: Andrey Batyiev Date: Wed, 25 Aug 2021 13:49:54 +0300 Subject: [PATCH] SYNERGY-1133 Clipboard sharing re-enables automatically (#7078) * SYNERGY-1133 Clipboard sharing re-enables automatically * Fix save order for clipboard and clipboard chunk size * SYNERGY-1133 Clipboard sharing re enables automatically *Update ChangeLog Co-authored-by: Andrii Batyiev Co-authored-by: SerhiiGadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com> --- ChangeLog | 1 + src/gui/src/ServerConfig.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4129ef047..23b29545e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ v1.14.2-snapshot =========== Bug fixes: - #7070 Fix radio button shifted focus on macOS +- #7078 Fix clipboard re-enables automatically - #7077 Fix Ubuntu, CentOS and Debian build after SYNERGY-1161 Enhancements: diff --git a/src/gui/src/ServerConfig.cpp b/src/gui/src/ServerConfig.cpp index e102f8d67..2527897c8 100644 --- a/src/gui/src/ServerConfig.cpp +++ b/src/gui/src/ServerConfig.cpp @@ -196,9 +196,9 @@ void ServerConfig::loadSettings() setIgnoreAutoConfigClient(settings().value("ignoreAutoConfigClient").toBool()); setDisableLockToScreen(settings().value("disableLockToScreen", false).toBool()); setEnableDragAndDrop(settings().value("enableDragAndDrop", true).toBool()); - setClipboardSharing(settings().value("clipboardSharing", true).toBool()); setClipboardSharingSize(settings().value("clipboardSharingSize", (int) ServerConfig::defaultClipboardSharingSize()).toULongLong()); + setClipboardSharing(settings().value("clipboardSharing", true).toBool()); readSettings(settings(), switchCorners(), "switchCorner", false, NumSwitchCorners);