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);