diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 01:09:05 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 01:09:05 +0100 |
| commit | 164263e1a12fc8a3a496739799cb60d547857f0a (patch) | |
| tree | f94c76301d393c9e232a0d7d3f6d6f43373f8c56 /nx-X11/programs/Xserver/hw/nxagent/Events.c | |
| parent | 05152b788ab184f45df1f64182791c88a09dc6f9 (diff) | |
| parent | 8d00456ad3e7b7a49d8fadb269334589e3704758 (diff) | |
| download | nx-libs-164263e1a12fc8a3a496739799cb60d547857f0a.tar.gz nx-libs-164263e1a12fc8a3a496739799cb60d547857f0a.tar.bz2 nx-libs-164263e1a12fc8a3a496739799cb60d547857f0a.zip | |
Merge branch 'sunweaver-pr/nomagicpixel' into 3.6.x
Attributes GH PR #658: https://github.com/ArcticaProject/nx-libs/pull/658
Fixes: ArcticaProject/nx-libs#657
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Events.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 315b6572e..8681ab270 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -1218,7 +1218,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was if (nxagentOption(Fullscreen)) { - if (nxagentMagicPixelZone(X.xbutton.x, X.xbutton.y)) + if ( (nxagentOption(MagicPixel) == 1) && (nxagentMagicPixelZone(X.xbutton.x, X.xbutton.y)) ) { pScreen = nxagentScreen(X.xbutton.window); |