From 8dbdc90ebeef8009340b666228fb1c0ecaf32032 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 25 Sep 2015 00:20:53 +0200
Subject: [PATCH] Revert "Main menu loop now does rendering, data runloop does
 actual"

This reverts commit 297a63c77b505e5f35a0d5445b77129c5ca3b267.
---
 runloop.c      | 15 +++++----------
 runloop_data.c |  7 ++-----
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/runloop.c b/runloop.c
index 4533573d50..5b26f401d2 100644
--- a/runloop.c
+++ b/runloop.c
@@ -993,8 +993,6 @@ static void rarch_main_cmd_get_state(driver_t *driver,
          RARCH_CHEAT_TOGGLE);
 }
 
-unsigned menu_input_this_frame;
-
 /**
  * rarch_main_iterate:
  *
@@ -1079,19 +1077,16 @@ int rarch_main_iterate(unsigned *sleep_ms)
    }
    
 #ifdef HAVE_MENU
-   menu_input_this_frame = 0;
    if (menu_driver_alive())
    {
       menu_handle_t *menu = menu_driver_get_ptr();
       if (menu)
-      {
-         menu_input_this_frame = menu_input_frame(input, trigger_input);
-         menu_iterate_render();
+         if (menu_iterate(true, menu_input_frame(input, trigger_input)) == -1)
+            rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
 
-         if (!input && settings->menu.pause_libretro)
-            return 1;
-         return rarch_limit_frame_time(settings->fastforward_ratio, sleep_ms);
-      }
+      if (!input && settings->menu.pause_libretro)
+        return 1;
+      return rarch_limit_frame_time(settings->fastforward_ratio, sleep_ms);
    }
 #endif
 
diff --git a/runloop_data.c b/runloop_data.c
index 6d37fc646b..bbcf683ed5 100644
--- a/runloop_data.c
+++ b/runloop_data.c
@@ -20,7 +20,6 @@
 #include <file/file_path.h>
 
 #include "general.h"
-#include "retroarch.h"
 
 #include "tasks/tasks.h"
 #include "input/input_overlay.h"
@@ -210,16 +209,14 @@ error:
 #endif
 
 #ifdef HAVE_MENU
-extern unsigned menu_input_this_frame;
-
 static void rarch_main_data_menu_iterate(void)
 {
 #ifdef HAVE_LIBRETRODB
    if (rarch_main_data_db_pending_scan_finished())
       menu_environment_cb(MENU_ENVIRON_RESET_HORIZONTAL_LIST, NULL);
 #endif
-   if (menu_iterate(true, menu_input_this_frame) == -1)
-      rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
+
+   menu_iterate_render();
 }
 #endif