aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/randr/rrmode.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-03-01 15:19:26 +0100
committerMihai Moldovan <ionic@ionic.de>2017-03-01 15:19:26 +0100
commitf42d36fb73e096113a948a04279b752689f157bc (patch)
tree1abbd59d6f4824d32ff86f532bff79cae734a339 /nx-X11/programs/Xserver/randr/rrmode.c
parent5e68c1283c297fb428a9347517ea02576bd55546 (diff)
parentbdc212b846b4196135a9468699aa40eef57a5d07 (diff)
downloadnx-libs-f42d36fb73e096113a948a04279b752689f157bc.tar.gz
nx-libs-f42d36fb73e096113a948a04279b752689f157bc.tar.bz2
nx-libs-f42d36fb73e096113a948a04279b752689f157bc.zip
Merge branch 'sunweaver-pr/randr-regression-fix-re-adding-RegisterResourceName-calls' into 3.6.x
Attributes GH PR #311: https://github.com/ArcticaProject/nx-libs/pull/311
Diffstat (limited to 'nx-X11/programs/Xserver/randr/rrmode.c')
-rw-r--r--nx-X11/programs/Xserver/randr/rrmode.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/randr/rrmode.c b/nx-X11/programs/Xserver/randr/rrmode.c
index 9f8277a55..876ebea42 100644
--- a/nx-X11/programs/Xserver/randr/rrmode.c
+++ b/nx-X11/programs/Xserver/randr/rrmode.c
@@ -326,6 +326,9 @@ RRModeInit(void)
if (!RRModeType)
return FALSE;
+#ifdef NXAGENT_SERVER
+ RegisterResourceName(RRModeType, "MODE");
+#endif
return TRUE;
}