diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-04-10 15:01:39 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-04-10 15:01:39 +0200 |
| commit | 5421dd444422df233c2bba82b994ce8f8d677044 (patch) | |
| tree | 9df00122916a65b8c53ee37129628efd916029f9 /nx-X11/programs/Xserver/xfixes/cursor.c | |
| parent | ab3974f22b213a64316bf4384c3fd6d92c005f58 (diff) | |
| parent | 93ea74e53e13890ea2f85ea57e9455d0eb2525f4 (diff) | |
| download | nx-libs-5421dd444422df233c2bba82b994ce8f8d677044.tar.gz nx-libs-5421dd444422df233c2bba82b994ce8f8d677044.tar.bz2 nx-libs-5421dd444422df233c2bba82b994ce8f8d677044.zip | |
Merge branch 'sunweaver-pr/remove-index-from-CloseScreen-ABI-backport' into 3.6.x
Attributes GH PR #411: https://github.com/ArcticaProject/nx-libs/pull/411
Diffstat (limited to 'nx-X11/programs/Xserver/xfixes/cursor.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xfixes/cursor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/xfixes/cursor.c b/nx-X11/programs/Xserver/xfixes/cursor.c index 441c4d0b2..00a912be3 100644 --- a/nx-X11/programs/Xserver/xfixes/cursor.c +++ b/nx-X11/programs/Xserver/xfixes/cursor.c @@ -114,17 +114,17 @@ CursorDisplayCursor (ScreenPtr pScreen, } static Bool -CursorCloseScreen (int index, ScreenPtr pScreen) +CursorCloseScreen (ScreenPtr pScreen) { CursorScreenPtr cs = GetCursorScreen (pScreen); Bool ret; Unwrap (cs, pScreen, CloseScreen); Unwrap (cs, pScreen, DisplayCursor); - ret = (*pScreen->CloseScreen) (index, pScreen); + ret = (*pScreen->CloseScreen) (pScreen); free (cs); - if (index == 0) - CursorScreenPrivateIndex = -1; + if (screenInfo.numScreens <= 1) + CursorScreenPrivateIndex = -1; return ret; } |