aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-05-22 00:50:51 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-05-22 00:50:51 +0200
commitfdaa240434e4b5022f2bc6b6aa7f590c0dcdc794 (patch)
tree316ac30721a364e72b4fddf9e3a21ceb81ef7547 /nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
parentfe72988fb668ad97fc4fcb2ee3862613324d9516 (diff)
parent222a4a22214608b7f89691eee1c57873c2631705 (diff)
downloadnx-libs-fdaa240434e4b5022f2bc6b6aa7f590c0dcdc794.tar.gz
nx-libs-fdaa240434e4b5022f2bc6b6aa7f590c0dcdc794.tar.bz2
nx-libs-fdaa240434e4b5022f2bc6b6aa7f590c0dcdc794.zip
Merge branch 'nxagent'
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Reconnect.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Reconnect.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
index 90b80799c..3c576c6e0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -377,11 +377,10 @@ Bool nxagentReconnectSession(void)
nxagentResizeDesktopAtStartup = False;
/*
- * The default is device settings have
- * not to be propagated to the X server.
+ * Propagate device settings if explicitly asked for.
*/
- nxagentChangeOption(DeviceControl, False);
+ nxagentChangeOption(DeviceControl, nxagentOption(DeviceControlUserDefined));
/*
* We need to zero out every new XID