libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 07:59:42 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Fix quit on close in CLI mode (#16054)

Browse Source 
This should fix #16048 It seems that launched_from_cli is overwritten
right after the core unload, which makes RA think it was *not* CLI
launched.
This commit is contained in:
David G. F 2023-12-28 20:10:22 +01:00 committed by GitHub
parent 99309a4d79
commit b30aa330aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
menu/cbs/menu_cbs_ok.c
View File

@ -5539,6 +5539,9 @@ int action_ok_close_content(const char *path, const char *label, unsigned type,
* menu list) */ * menu list) */
menu_st->selection_ptr = 0; menu_st->selection_ptr = 0;
/* Check if we need to quit */
check_quit_on_close();
/* Unload core */ /* Unload core */
ret = generic_action_ok_command(CMD_EVENT_UNLOAD_CORE); ret = generic_action_ok_command(CMD_EVENT_UNLOAD_CORE);
@ -5572,8 +5575,6 @@ int action_ok_close_content(const char *path, const char *label, unsigned type,
menu_st->flags &= ~MENU_ST_FLAG_PREVENT_POPULATE; menu_st->flags &= ~MENU_ST_FLAG_PREVENT_POPULATE;
} }
check_quit_on_close();
return ret; return ret;
} }