ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(RMenu/RGUI) Free rgui and filebrowser in upper-layer menu_free() function

This commit is contained in:
twinaphex 2013-04-18 17:29:04 +02:00
parent bc4bd6b684
commit 5b35feddae
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/menu/menu_common.c
View File

@ -155,7 +155,7 @@ static bool directory_parse(void *data, const char *path)
} }
void filebrowser_free(void *data) static void filebrowser_free(void *data)
{ {
filebrowser_t *filebrowser = (filebrowser_t*)data; filebrowser_t *filebrowser = (filebrowser_t*)data;
@ -334,4 +334,10 @@ void menu_init(void)
void menu_free(void) void menu_free(void)
{ {
rgui_free(rgui); rgui_free(rgui);
#ifdef HAVE_FILEBROWSER
filebrowser_free(rgui->browser);
#endif
free(rgui);
} }

2
frontend/menu/rgui.c
View File

@ -230,8 +230,6 @@ void rgui_free(rgui_handle_t *rgui)
#ifdef HAVE_DYNAMIC #ifdef HAVE_DYNAMIC
libretro_free_system_info(&rgui->info); libretro_free_system_info(&rgui->info);
#endif #endif
free(rgui);
} }
static uint16_t gray_filler(unsigned x, unsigned y) static uint16_t gray_filler(unsigned x, unsigned y)

3
frontend/menu/rmenu.c
View File

@ -3308,9 +3308,6 @@ void rgui_free(rgui_handle_t *rgui)
menu_texture->pixels = NULL; menu_texture->pixels = NULL;
} }
#endif #endif
filebrowser_free(rgui->browser);
free(rgui);
} }
bool menu_iterate(void) bool menu_iterate(void)

1
frontend/menu/rmenu_xui.cpp
View File

@ -1364,7 +1364,6 @@ rgui_handle_t *rgui_init (void)
void rgui_free (rgui_handle_t *rgui) void rgui_free (rgui_handle_t *rgui)
{ {
filebrowser_free(rgui->browser);
app.Uninit(); app.Uninit();
} }

1
frontend/menu/utils/file_browser.h
View File

@ -52,7 +52,6 @@ typedef enum
} filebrowser_action_t; } filebrowser_action_t;
void filebrowser_set_root_and_ext(void *data, const char *ext, const char *root_dir); void filebrowser_set_root_and_ext(void *data, const char *ext, const char *root_dir);
void filebrowser_free(void *data);
bool filebrowser_iterate(void *data, unsigned action); bool filebrowser_iterate(void *data, unsigned action);
#endif /* FILEBROWSER_H_ */ #endif /* FILEBROWSER_H_ */