mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent crash at exit on OSX

Browse Source
This commit is contained in:
twinaphex 2019-02-08 04:49:59 +01:00
parent 5542214409
commit 72d58d318a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
menu/drivers/rgui.c
View File

@ -1917,7 +1917,7 @@ static void rgui_navigation_clear(void *data, bool pending_push)
rgui->scroll_y = 0; rgui->scroll_y = 0;
} }
static const char *rgui_thumbnail_ident() static const char *rgui_thumbnail_ident(void)
{ {
char folder = 0; char folder = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -2231,6 +2231,13 @@ static void rgui_toggle(void *userdata, bool menu_on)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
/* TODO/FIXME - when we close RetroArch, this function
* gets called and settings is NULL at this point.
* Maybe fundamentally change control flow so that on RetroArch
* exit, this doesn't get called. */
if (!settings)
return;
if (settings->bools.menu_rgui_lock_aspect) if (settings->bools.menu_rgui_lock_aspect)
{ {
if (menu_on) if (menu_on)
@ -2246,9 +2253,7 @@ static void rgui_toggle(void *userdata, bool menu_on)
else else
{ {
if (settings->uints.video_aspect_ratio_idx != ASPECT_RATIO_4_3) if (settings->uints.video_aspect_ratio_idx != ASPECT_RATIO_4_3)
{
video_driver_set_aspect_ratio(); video_driver_set_aspect_ratio();
}
} }
} }
} }