Skip to content
Permalink
Browse files

Removed redundant mouse clean up on quit for some platforms.

SDL_MouseQuit() already frees cursors and sets fields to NULL.
  • Loading branch information
philippwiesemann committed May 19, 2017
1 parent a9c7bc8 commit bf8ccf08bb0b9be15bad4461e3b64c7bff810e32
@@ -262,17 +262,6 @@ Emscripten_InitMouse()
void
Emscripten_FiniMouse()
{
SDL_Mouse* mouse = SDL_GetMouse();

Emscripten_FreeCursor(mouse->def_cursor);
mouse->def_cursor = NULL;

mouse->CreateCursor = NULL;
mouse->ShowCursor = NULL;
mouse->FreeCursor = NULL;
mouse->WarpMouse = NULL;
mouse->CreateSystemCursor = NULL;
mouse->SetRelativeMouseMode = NULL;
}

#endif /* SDL_VIDEO_DRIVER_EMSCRIPTEN */
@@ -284,17 +284,6 @@ MIR_InitMouse()
void
MIR_FiniMouse()
{
SDL_Mouse* mouse = SDL_GetMouse();

MIR_FreeCursor(mouse->def_cursor);
mouse->def_cursor = NULL;

mouse->CreateCursor = NULL;
mouse->ShowCursor = NULL;
mouse->FreeCursor = NULL;
mouse->WarpMouse = NULL;
mouse->CreateSystemCursor = NULL;
mouse->SetRelativeMouseMode = NULL;
}

#endif /* SDL_VIDEO_DRIVER_MIR */
@@ -392,23 +392,5 @@ Wayland_FiniMouse(void)
/* This effectively assumes that nobody else
* touches SDL_Mouse which is effectively
* a singleton */

SDL_Mouse *mouse = SDL_GetMouse();

/* Free the current cursor if not the same pointer as
* the default cursor */
if (mouse->def_cursor != mouse->cur_cursor)
Wayland_FreeCursor (mouse->cur_cursor);

Wayland_FreeCursor (mouse->def_cursor);
mouse->def_cursor = NULL;
mouse->cur_cursor = NULL;

mouse->CreateCursor = NULL;
mouse->CreateSystemCursor = NULL;
mouse->ShowCursor = NULL;
mouse->FreeCursor = NULL;
mouse->WarpMouse = NULL;
mouse->SetRelativeMouseMode = NULL;
}
#endif /* SDL_VIDEO_DRIVER_WAYLAND */
@@ -311,13 +311,6 @@ WIN_InitMouse(_THIS)
void
WIN_QuitMouse(_THIS)
{
SDL_Mouse *mouse = SDL_GetMouse();
if ( mouse->def_cursor ) {
SDL_free(mouse->def_cursor);
mouse->def_cursor = NULL;
mouse->cur_cursor = NULL;
}

if (rawInputEnableCount) { /* force RAWINPUT off here. */
rawInputEnableCount = 1;
ToggleRawInput(SDL_FALSE);

0 comments on commit bf8ccf0

Please sign in to comment.