From 19afc807efa242ef503f184de71469b50e662b6c Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Tue, 10 May 2016 23:33:51 +0200 Subject: [PATCH] (iOS) Not sure why we are calling rarch_main() twice for iOS --- menu/menu_driver.c | 2 +- ui/drivers/ui_cocoatouch.m | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/menu/menu_driver.c b/menu/menu_driver.c index a7ebcfac2a..006820a9c6 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -761,7 +761,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data) if (!latch) return false; - if (menu_driver_ctx->toggle) + if (menu_driver_ctx && menu_driver_ctx->toggle) menu_driver_ctx->toggle(menu_userdata, *latch); } break; diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m index 586dada58a..aae07ab0e0 100644 --- a/ui/drivers/ui_cocoatouch.m +++ b/ui/drivers/ui_cocoatouch.m @@ -337,9 +337,6 @@ enum apple_platform = self; [self setDelegate:self]; - - if (rarch_main(argc, argv, NULL)) - apple_rarch_exited(); #ifdef HAVE_AVFOUNDATION /* Other background audio check */