From 67ce6f2bcf9e1936b23f765245cc5f85a7379844 Mon Sep 17 00:00:00 2001 From: asvitkine <> Date: Wed, 28 Dec 2011 21:35:42 +0000 Subject: [PATCH] re-enable hardware cursor switching for SDL 1.2.14+, since the bug appears to have been fixed --- BasiliskII/src/SDL/video_sdl.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/BasiliskII/src/SDL/video_sdl.cpp b/BasiliskII/src/SDL/video_sdl.cpp index d2472fe9..2e250b8a 100644 --- a/BasiliskII/src/SDL/video_sdl.cpp +++ b/BasiliskII/src/SDL/video_sdl.cpp @@ -1549,9 +1549,10 @@ bool video_can_change_cursor(void) if (SDL_VideoDriverName(driver, sizeof driver) == NULL || strncmp(driver, "Quartz", sizeof driver)) quartzok = true; else { - // Quartz driver bug prevents cursor changing in SDL 1.2.11 and later + // Quartz driver bug prevents cursor changing in SDL 1.2.11 to 1.2.13. const SDL_version *vp = SDL_Linked_Version(); - quartzok = SDL_VERSIONNUM(vp->major, vp->minor, vp->patch) <= SDL_VERSIONNUM(1, 2, 10); + int version = SDL_VERSIONNUM(vp->major, vp->minor, vp->patch); + quartzok = (version <= SDL_VERSIONNUM(1, 2, 10) || version >= SDL_VERSIONNUM(1, 2, 14)); } }