branch 'unstable' of https://github.com/djoslin0/sm64ex-coop into unstable

This commit is contained in:
MysterD 2020-10-16 23:33:47 -07:00
commit bb9d46a45c
2 changed files with 10 additions and 2 deletions

View File

@ -292,7 +292,11 @@ void custom_menu_init(struct CustomMenu* head) {
void custom_menu_loop(void) { void custom_menu_loop(void) {
// we've received an event that makes us exit the menus // we've received an event that makes us exit the menus
if (sGotoGame) { sSelectedFileNum = sGotoGame; } if (sGotoGame) {
sSelectedFileNum = sGotoGame;
custom_menu_close_system();
custom_menu_destroy();
}
// force-start the load when command-line server hosting // force-start the load when command-line server hosting
if (gNetworkType == NT_SERVER && sSelectedFileNum == 0) { if (gNetworkType == NT_SERVER && sSelectedFileNum == 0) {

View File

@ -96,7 +96,11 @@ void custom_menu_system_init(void) {
} }
void custom_menu_destroy(void) { void custom_menu_destroy(void) {
/* TODO: we should probably clean up all of this stuff */ // TODO: clean up all of the calloc()'d memory
sHead = NULL;
sCurrentMenu = NULL;
sLastMenu = NULL;
overlay = NULL;
} }
void custom_menu_system_loop(void) { void custom_menu_system_loop(void) {