From b515cd10f11b9d79f6af092f6b86b8ad0f864927 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 29 Apr 2017 17:16:05 +0200
Subject: [PATCH] Pass video_is_threaded to context_reset

---
 menu/drivers/materialui.c | 6 +++---
 menu/drivers/nuklear.c    | 2 +-
 menu/drivers/xmb.c        | 2 +-
 menu/drivers/zarch.c      | 2 +-
 menu/menu_driver.c        | 4 ++--
 menu/menu_driver.h        | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 0469c7cf0c..74c382ebf4 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -1407,7 +1407,7 @@ static void mui_frame(void *data, video_frame_info_t *video_info)
    menu_display_unset_viewport(video_info->width, video_info->height);
 }
 
-static void mui_layout(mui_handle_t *mui)
+static void mui_layout(mui_handle_t *mui, bool video_is_threaded)
 {
    float scale_factor;
    int new_font_size, new_font_size2;
@@ -1629,7 +1629,7 @@ static void mui_populate_entries(
    mui->scroll_y = mui_get_scroll(mui);
 }
 
-static void mui_context_reset(void *data)
+static void mui_context_reset(void *data, bool is_threaded)
 {
    mui_handle_t *mui              = (mui_handle_t*)data;
    settings_t *settings           = config_get_ptr();
@@ -1637,7 +1637,7 @@ static void mui_context_reset(void *data)
    if (!mui || !settings)
       return;
 
-   mui_layout(mui);
+   mui_layout(mui, is_threaded);
    mui_context_bg_destroy(mui);
    menu_display_allocate_white_texture();
    mui_context_reset_textures(mui);
diff --git a/menu/drivers/nuklear.c b/menu/drivers/nuklear.c
index 219c849ffc..6361eb638b 100644
--- a/menu/drivers/nuklear.c
+++ b/menu/drivers/nuklear.c
@@ -419,7 +419,7 @@ static void nk_menu_context_load_textures(nk_menu_handle_t *nk,
    }
 }
 
-static void nk_menu_context_reset(void *data)
+static void nk_menu_context_reset(void *data, bool is_threaded)
 {
    char iconpath[PATH_MAX_LENGTH] = {0};
    nk_menu_handle_t *nk           = (nk_menu_handle_t*)data;
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 166f382cd9..56323c1966 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -3533,7 +3533,7 @@ static void xmb_context_reset_background(const char *iconpath)
             menu_display_handle_wallpaper_upload, NULL);
 }
 
-static void xmb_context_reset(void *data)
+static void xmb_context_reset(void *data, bool is_threaded)
 {
    char iconpath[PATH_MAX_LENGTH];
    xmb_handle_t *xmb               = (xmb_handle_t*)data;
diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c
index ca4bd0ea09..c6d0d13ed0 100644
--- a/menu/drivers/zarch.c
+++ b/menu/drivers/zarch.c
@@ -1081,7 +1081,7 @@ static bool zarch_load_image(void *userdata,
    return true;
 }
 
-static void zarch_context_reset(void *data)
+static void zarch_context_reset(void *data, bool is_threaded)
 {
    settings_t *settings  = config_get_ptr();
    zui_t          *zui   = (zui_t*)data;
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 2f813efa25..aef53cdfd6 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -458,11 +458,11 @@ void menu_driver_decrement_navigation(void)
       menu_driver_ctx->navigation_decrement(menu_userdata);
 }
 
-bool menu_driver_context_reset(bool is_threaded)
+bool menu_driver_context_reset(bool video_is_threaded)
 {
    if (!menu_driver_ctx || !menu_driver_ctx->context_reset)
       return false;
-   menu_driver_ctx->context_reset(menu_userdata);
+   menu_driver_ctx->context_reset(menu_userdata, video_is_threaded);
    return true;
 }
 
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index a211900f6a..c92c0dcf3b 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -231,7 +231,7 @@ typedef struct menu_ctx_driver
    void  (*frame)(void *data, video_frame_info_t *video_info);
    void* (*init)(void**);
    void  (*free)(void*);
-   void  (*context_reset)(void *data);
+   void  (*context_reset)(void *data, bool video_is_threaded);
    void  (*context_destroy)(void *data);
    void  (*populate_entries)(void *data,
          const char *path, const char *label,