From 0330d2f2454c1d89fe6d03ccbcae07c164c41e7f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 16 May 2015 16:37:46 +0200 Subject: [PATCH] Make rarch_main_data_active a public function --- runloop.c | 3 ++- runloop_data.c | 4 ++-- runloop_data.h | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/runloop.c b/runloop.c index 5a68951982..a6bfb2747d 100644 --- a/runloop.c +++ b/runloop.c @@ -1110,7 +1110,8 @@ int rarch_main_iterate(void) rarch_main_iterate_linefeed_overlay(); #endif - rarch_main_data_iterate(); + if (rarch_main_data_active(runloop)) + rarch_main_data_iterate(); #ifdef HAVE_MENU if (runloop->is_menu) diff --git a/runloop_data.c b/runloop_data.c index c65efcd6e5..9b3bf5a007 100644 --- a/runloop_data.c +++ b/runloop_data.c @@ -107,8 +107,7 @@ static void data_runloop_iterate(bool is_thread, data_runloop_t *runloop) } -#ifdef HAVE_THREADS -static bool rarch_main_data_active(data_runloop_t *runloop) +bool rarch_main_data_active(data_runloop_t *runloop) { bool image_active, nbio_active, http_active, http_conn_active, overlay_active; @@ -201,6 +200,7 @@ static void data_thread_loop(void *data) RARCH_LOG("[Data Thread]: Stopping data thread.\n"); } +#ifdef HAVE_THREADS static void rarch_main_data_thread_init(void) { data_runloop_t *runloop = (data_runloop_t*)rarch_main_data_get_ptr(); diff --git a/runloop_data.h b/runloop_data.h index 04cc5b3aad..4b9711fcbc 100644 --- a/runloop_data.h +++ b/runloop_data.h @@ -163,6 +163,8 @@ void rarch_main_data_free(void); void rarch_main_data_init_queues(void); +bool rarch_main_data_active(data_runloop_t *runloop); + #ifdef __cplusplus } #endif