mirror of
https://github.com/yawut/SDL.git
synced 2026-04-19 07:07:19 -05:00
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:
parent
e6f7f2551a
commit
4c8d5e20a7
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user