From 460019589565ac422049ca65bdbcdd751e85ab12 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 9 Aug 2019 20:45:54 +0200
Subject: [PATCH] Refactor some menu_driver_alive code

---
 menu/menu_driver.c | 16 +++++++++-------
 menu/menu_driver.h |  2 ++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 99aea7ee0e..17998ee759 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -1940,15 +1940,12 @@ static void menu_driver_toggle(bool on)
    if (menu_driver_ctx && menu_driver_ctx->toggle)
       menu_driver_ctx->toggle(menu_userdata, on);
 
-   if (on)
-      menu_driver_alive = true;
-   else
-      menu_driver_alive = false;
+   menu_driver_set_alive(on);
 
    rarch_ctl(RARCH_CTL_FRONTEND_KEY_EVENT_GET, &frontend_key_event);
    rarch_ctl(RARCH_CTL_KEY_EVENT_GET,          &key_event);
 
-   if (menu_driver_alive)
+   if (menu_driver_is_alive())
    {
       bool refresh = false;
 
@@ -2007,7 +2004,7 @@ static void menu_driver_toggle(bool on)
 
 const char *menu_driver_ident(void)
 {
-   if (!menu_driver_alive)
+   if (!menu_driver_is_alive())
       return NULL;
    if (!menu_driver_ctx || !menu_driver_ctx->ident)
       return NULL;
@@ -2016,7 +2013,7 @@ const char *menu_driver_ident(void)
 
 void menu_driver_frame(video_frame_info_t *video_info)
 {
-   if (menu_driver_alive && menu_driver_ctx->frame)
+   if (menu_driver_is_alive() && menu_driver_ctx->frame)
       menu_driver_ctx->frame(menu_userdata, video_info);
 }
 
@@ -2026,6 +2023,11 @@ bool menu_driver_get_load_content_animation_data(menu_texture_item *icon, char *
       && menu_driver_ctx->get_load_content_animation_data(menu_userdata, icon, playlist_name);
 }
 
+void menu_driver_set_alive(bool val)
+{
+   menu_driver_alive = val;
+}
+
 /* Checks if the menu is still running */
 bool menu_driver_is_alive(void)
 {
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 48bb5d4a83..2ddd1234b2 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -517,6 +517,8 @@ bool menu_driver_get_load_content_animation_data(menu_texture_item *icon, char *
  * return true for RGUI, for instance. */
 bool menu_driver_is_texture_set(void);
 
+void menu_driver_set_alive(bool val);
+
 bool menu_driver_is_alive(void);
 
 bool menu_driver_iterate(menu_ctx_iterate_t *iterate);