diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-03-10 20:19:19 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-10 20:19:19 +0100 |
| commit | 320cece2e97035665d4df5e382ea45e5a7f07efa (patch) | |
| tree | e69e6342ece32a992ae29376697b4ecc691266de /nx-X11/programs/Xserver/hw/nxagent/Window.c | |
| parent | dc8477f76372e685eb999a71afb4e5ec7e3176f1 (diff) | |
| parent | ee2a933c3d4ad65849443cc917c59ad479083ca8 (diff) | |
| download | nx-libs-320cece2e97035665d4df5e382ea45e5a7f07efa.tar.gz nx-libs-320cece2e97035665d4df5e382ea45e5a7f07efa.tar.bz2 nx-libs-320cece2e97035665d4df5e382ea45e5a7f07efa.zip | |
Merge branch 'uli42-pr/misc_cherries' into 3.6.x
Attributes GH PR #378: https://github.com/ArcticaProject/nx-libs/pull/378
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Window.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Window.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index 982c88314..23e1d5452 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -3122,10 +3122,14 @@ static void nxagentReconfigureWindowCursor(void * param0, XID param1, void * dat WindowPtr pWin = (WindowPtr)param0; Bool *pBool = (Bool*)data_buffer; CursorPtr pCursor; - ScreenPtr pScreen = pWin -> drawable.pScreen; + ScreenPtr pScreen; - if (!pWin || !*pBool || !(pCursor = wCursor(pWin)) || - !(nxagentCursorPriv(pCursor, pScreen))) + if (!pWin || !*pBool || !(pCursor = wCursor(pWin))) + return; + + pScreen = pWin -> drawable.pScreen; + + if (!(nxagentCursorPriv(pCursor, pScreen))) { return; } |