eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-06-02 09:57:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

testtray: minor cleanup

Browse source
This commit is contained in:
Sam Lantinga 2025-01-19 16:45:12 -08:00
parent 3afd1e7eaa
commit b716eeefef
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/testtray.c
View file

@ -19,8 +19,6 @@ static void SDLCALL tray_close(void *ptr, SDL_TrayEntry *entry)
SDL_DestroyTray(trays[0]); SDL_DestroyTray(trays[0]);
SDL_DestroyTray(trays[1]); SDL_DestroyTray(trays[1]);
SDL_free(trays);
} }
static void SDLCALL apply_icon(void *ptr, const char * const *filelist, int filter) static void SDLCALL apply_icon(void *ptr, const char * const *filelist, int filter)
@ -485,6 +483,7 @@ static void SDLCALL append_submenu_to(void *ptr, SDL_TrayEntry *entry)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
SDL_Tray **trays = NULL;
SDLTest_CommonState *state; SDLTest_CommonState *state;
int i; int i;
@ -514,7 +513,7 @@ int main(int argc, char **argv)
return 1; return 1;
} }
SDL_Window *w = SDL_CreateWindow("", 640, 480, 0); SDL_Window *w = SDL_CreateWindow("testtray", 640, 480, 0);
if (!w) { if (!w) {
SDL_Log("Couldn't create window: %s", SDL_GetError()); SDL_Log("Couldn't create window: %s", SDL_GetError());
@ -570,7 +569,7 @@ int main(int argc, char **argv)
CHECK(entry_close); CHECK(entry_close);
/* TODO: Track memory! */ /* TODO: Track memory! */
SDL_Tray **trays = SDL_malloc(sizeof(SDL_Tray *) * 2); trays = SDL_malloc(sizeof(SDL_Tray *) * 2);
if (!trays) { if (!trays) {
goto clean_all; goto clean_all;
} }
@ -631,6 +630,7 @@ clean_tray1:
if (!trays_destroyed) { if (!trays_destroyed) {
SDL_DestroyTray(tray); SDL_DestroyTray(tray);
} }
SDL_free(trays);
clean_window: clean_window:
if (w) { if (w) {