Fixed cursor leak when quitting the mouse subsystem

2 files changed, 17 insertions, 2 deletions

diff --git a/src/events/SDL_mouse.c b/src/events/SDL_mouse.c
index 5536ab73b7..e9404f0577 100644
--- a/src/events/SDL_mouse.c
+++ b/src/events/SDL_mouse.c
@@ -361,6 +361,23 @@ SDL_SendMouseWheel(SDL_Window * window, SDL_MouseID mouseID, int x, int y)
 void
 SDL_MouseQuit(void)
 {
+    SDL_Cursor *cursor, *next;
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    SDL_ShowCursor(1);
+
+    cursor = mouse->cursors;
+    while (cursor) {
+        next = cursor->next;
+        SDL_FreeCursor(cursor);
+        cursor = next;
+    }
+
+    if (mouse->def_cursor && mouse->FreeCursor) {
+        mouse->FreeCursor(mouse->def_cursor);
+    }
+
+    SDL_zerop(mouse);
 }
 
 Uint32
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index d2b94898c8..8b3c2f0732 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -2247,8 +2247,6 @@ SDL_VideoQuit(void)
 
     SDL_EnableScreenSaver();
 
-    SDL_ShowCursor(1);
-
     /* Clean up the system video */
     while (_this->windows) {
         SDL_DestroyWindow(_this->windows);