From 36c81480d7e03874c7acbd71e44a37c256470b2f Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Mon, 30 Jan 2017 14:23:16 +0000 Subject: [PATCH] #6344 Fix clipboard size limit initialization order Setting the clipboard sharing size to a value > 0 enables clipboard sharing. Make sure we do this before applying the users actual preference. --- src/gui/src/ServerConfigDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/src/ServerConfigDialog.cpp b/src/gui/src/ServerConfigDialog.cpp index 5b4342a0..6532af96 100644 --- a/src/gui/src/ServerConfigDialog.cpp +++ b/src/gui/src/ServerConfigDialog.cpp @@ -105,8 +105,8 @@ void ServerConfigDialog::accept() serverConfig().setIgnoreAutoConfigClient(m_pCheckBoxIgnoreAutoConfigClient->isChecked()); serverConfig().setEnableDragAndDrop(m_pCheckBoxEnableDragAndDrop->isChecked()); serverConfig().setDisableLockToScreen(m_pCheckBoxDisableLockToScreen->isChecked()); - serverConfig().setClipboardSharing(m_pCheckBoxEnableClipboard->isChecked()); serverConfig().setClipboardSharingSize(m_pSpinBoxClipboardSizeLimit->value() * 1024); + serverConfig().setClipboardSharing(m_pCheckBoxEnableClipboard->isChecked()); // now that the dialog has been accepted, copy the new server config to the original one, // which is a reference to the one in MainWindow.