From 032abfffd404433af9f2266650e7978716451e3e Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 17 Aug 2015 06:31:39 +0200
Subject: [PATCH] Call menu_driver_render_messagebox from one place only

---
 menu/cbs/menu_cbs_iterate.c | 9 ++++++---
 menu/menu_input.c           | 9 +++------
 menu/menu_input.h           | 2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/menu/cbs/menu_cbs_iterate.c b/menu/cbs/menu_cbs_iterate.c
index 535c0bbdd5..d7c31b3370 100644
--- a/menu/cbs/menu_cbs_iterate.c
+++ b/menu/cbs/menu_cbs_iterate.c
@@ -382,8 +382,6 @@ static int action_iterate_menu_viewport(char *s, size_t len,
             base_msg, custom->x, custom->y, custom->width, custom->height);
    }
 
-   menu_driver_render_messagebox(s);
-
    if (!custom->width)
       custom->width = stride_x;
    if (!custom->height)
@@ -470,11 +468,16 @@ static int action_iterate_main(const char *label, unsigned action)
             action = MENU_ACTION_OK;
          break;
       case ITERATE_TYPE_BIND:
-         if (menu_input_bind_iterate())
+         if (menu_input_bind_iterate(msg, sizeof(msg)))
+         {
+            if (msg[0] != '\0')
+               do_messagebox = true;
             menu_list_pop_stack(menu_list);
+         }
          break;
       case ITERATE_TYPE_VIEWPORT:
          ret = action_iterate_menu_viewport(msg, sizeof(msg), label, action, hash);
+         do_messagebox   = true;
          break;
       case ITERATE_TYPE_INFO:
          ret = action_iterate_info(msg, sizeof(msg), label);
diff --git a/menu/menu_input.c b/menu/menu_input.c
index da49fafc60..a2561bc204 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -529,11 +529,10 @@ static int menu_input_bind_iterate_keyboard(int64_t current, int timeout)
    return 0;
 }
 
-int menu_input_bind_iterate(void)
+int menu_input_bind_iterate(char *s, size_t len)
 {
    int64_t current;
    struct menu_bind_state binds;
-   char msg[PATH_MAX_LENGTH]    = {0};
    int timeout                  = 0;
    menu_input_t *menu_input     = menu_input_get_ptr();
    driver_t *driver             = driver_get_ptr();
@@ -546,20 +545,18 @@ int menu_input_bind_iterate(void)
    timeout = (menu_input->binds.timeout_end - current) / 1000000;
 
    if (bind_mode_kb)
-   snprintf(msg, sizeof(msg),
+   snprintf(s, len,
          "[%s]\npress keyboard\n(timeout %d %s)",
          input_config_bind_map[
          menu_input->binds.begin - MENU_SETTINGS_BIND_BEGIN].desc,
          timeout,
          menu_hash_to_str(MENU_VALUE_SECONDS));
     else
-        snprintf(msg, sizeof(msg),
+        snprintf(s, len,
         "[%s]\npress joypad\n(RETURN to skip)",
         input_config_bind_map[
         menu_input->binds.begin - MENU_SETTINGS_BIND_BEGIN].desc);
 
-   menu_driver_render_messagebox(msg);
-
    if (bind_mode_kb)
       return menu_input_bind_iterate_keyboard(current, timeout);
 
diff --git a/menu/menu_input.h b/menu/menu_input.h
index c3cf12dd38..1a53bd9420 100644
--- a/menu/menu_input.h
+++ b/menu/menu_input.h
@@ -193,7 +193,7 @@ void menu_input_st_string_callback(void *userdata, const char *str);
 
 void menu_input_st_cheat_callback(void *userdata, const char *str);
 
-int menu_input_bind_iterate(void);
+int menu_input_bind_iterate(char *s, size_t len);
 
 unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_state);