diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-03-01 15:19:26 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-01 15:19:26 +0100 |
| commit | f42d36fb73e096113a948a04279b752689f157bc (patch) | |
| tree | 1abbd59d6f4824d32ff86f532bff79cae734a339 /nx-X11/programs/Xserver/randr/rrcrtc.c | |
| parent | 5e68c1283c297fb428a9347517ea02576bd55546 (diff) | |
| parent | bdc212b846b4196135a9468699aa40eef57a5d07 (diff) | |
| download | nx-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/rrcrtc.c')
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rrcrtc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/randr/rrcrtc.c b/nx-X11/programs/Xserver/randr/rrcrtc.c index 5ba66d5a6..59a3f446a 100644 --- a/nx-X11/programs/Xserver/randr/rrcrtc.c +++ b/nx-X11/programs/Xserver/randr/rrcrtc.c @@ -972,6 +972,10 @@ RRCrtcInit(void) if (!RRCrtcType) return FALSE; +#ifdef NXAGENT_SERVER + RegisterResourceName(RRCrtcType, "CRTC"); +#endif + return TRUE; } |