Skip to content

Commit

Permalink
Fix quit on close in CLI mode (#16054)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
davidgfnet authored Dec 28, 2023
1 parent 99309a4 commit b30aa33
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions menu/cbs/menu_cbs_ok.c
Original file line number Diff line number Diff line change
Expand Up @@ -5539,6 +5539,9 @@ int action_ok_close_content(const char *path, const char *label, unsigned type,
* menu list) */
menu_st->selection_ptr = 0;

/* Check if we need to quit */
check_quit_on_close();

/* Unload core */
ret = generic_action_ok_command(CMD_EVENT_UNLOAD_CORE);

Expand Down Expand Up @@ -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;
}

check_quit_on_close();

return ret;
}

Expand Down

0 comments on commit b30aa33

Please sign in to comment.