encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed test programs for joystick not exiting on events after first disconnect. 

Exit was broken since the main loop extraction needed for Emscripten support
because the former local but now global variables were not reset correctly.
This commit is contained in:
Philipp Wiesemann 2015-02-12 21:40:53 +01:00
parent 7fd15e7e2c
commit d1932834e2
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/testgamecontroller.c
View File

@ -163,6 +163,10 @@ WatchGameController(SDL_GameController * gamecontroller)
const size_t titlelen = SDL_strlen(basetitle) + SDL_strlen(name) + 1;
char *title = (char *)SDL_malloc(titlelen);
SDL_Window *window = NULL;
retval = SDL_FALSE;
done = SDL_FALSE;
if (title) {
SDL_snprintf(title, titlelen, "%s%s", basetitle, name);
}
@ -219,6 +223,10 @@ WatchGameController(SDL_GameController * gamecontroller)
#endif
SDL_DestroyRenderer(screen);
screen = NULL;
background = NULL;
button = NULL;
axis = NULL;
SDL_DestroyWindow(window);
return retval;
}

3
test/testjoystick.c
View File

@ -176,6 +176,8 @@ WatchJoystick(SDL_Joystick * joystick)
{
SDL_Window *window = NULL;
const char *name = NULL;
retval = SDL_FALSE;
done = SDL_FALSE;
/* Create a window to display joystick axis position */
@ -217,6 +219,7 @@ WatchJoystick(SDL_Joystick * joystick)
#endif
SDL_DestroyRenderer(screen);
screen = NULL;
SDL_DestroyWindow(window);
return retval;
}