diff --git a/source/main.c b/source/main.c index 0fc080c..f0bbe66 100644 --- a/source/main.c +++ b/source/main.c @@ -60,8 +60,7 @@ int main(int argc, const char* argv[]) { screen_init(); task_init(); - ui_view* mainmenu = mainmenu_create(); - ui_push(mainmenu); + mainmenu_open(); while(aptMainLoop()) { ui_update(); @@ -72,8 +71,6 @@ int main(int argc, const char* argv[]) { ui_draw(); } - mainmenu_destroy(mainmenu); - cleanup(); return 0; -} \ No newline at end of file +} diff --git a/source/ui/mainmenu.c b/source/ui/mainmenu.c index 78f075b..de2cbf4 100644 --- a/source/ui/mainmenu.c +++ b/source/ui/mainmenu.c @@ -48,6 +48,7 @@ static void mainmenu_draw_top(ui_view* view, void* data, float x1, float y1, flo static void mainmenu_update(ui_view* view, void* data, list_item** items, u32** itemCount, list_item* selected, bool selectedTouched) { if(hidKeysDown() & KEY_START) { ui_pop(); + list_destroy(view); return; } @@ -62,10 +63,6 @@ static void mainmenu_update(ui_view* view, void* data, list_item** items, u32** } } -ui_view* mainmenu_create() { - return list_create("Main Menu", "A: Select, START: Exit", NULL, mainmenu_update, mainmenu_draw_top); +void mainmenu_open() { + ui_push(list_create("Main Menu", "A: Select, START: Exit", NULL, mainmenu_update, mainmenu_draw_top)); } - -void mainmenu_destroy(ui_view* view) { - list_destroy(view); -} \ No newline at end of file diff --git a/source/ui/mainmenu.h b/source/ui/mainmenu.h index 4890e20..52f1e71 100644 --- a/source/ui/mainmenu.h +++ b/source/ui/mainmenu.h @@ -2,5 +2,4 @@ #include "ui.h" -ui_view* mainmenu_create(); -void mainmenu_destroy(ui_view* view); \ No newline at end of file +void mainmenu_open();