[SDL][Win] Destroy custom cursor on Close()

X11 destroys the cursor after setting it and Cocoa uses an autorelease pool, so that should not be necessary there.
opentk · May 1, 2014 · 9988a2b · 9988a2b
1 parent c8c0d32
commit 9988a2b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/Source/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs b/Source/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs
@@ -1057,6 +1057,12 @@ void Dispose(bool manual)
                         {
                             DestroyWindow();
                         }
+
+                        if (sdl_cursor != IntPtr.Zero)
+                        {
+                            SDL.FreeCursor(sdl_cursor);
+                            sdl_cursor = IntPtr.Zero;
+                        }
                     }
                     else
                     {

diff --git a/Source/OpenTK/Platform/Windows/WinGLNative.cs b/Source/OpenTK/Platform/Windows/WinGLNative.cs
@@ -1639,6 +1639,12 @@ void Dispose(bool calledManually)
             {
                 if (calledManually)
                 {
+                    if (Cursor != MouseCursor.Default && curson_handle != IntPtr.Zero)
+                    {
+                        Functions.DestroyIcon(curson_handle);
+                        curson_handle = IntPtr.Zero;
+                    }
+
                     // Safe to clean managed resources
                     DestroyWindow();
                     if (Icon != null)