From f38cdd1a64dd629651570feacfea564d92bf169c Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 5 Dec 2015 07:53:02 +0100
Subject: [PATCH] Create frontend_driver_content_loaded

---
 frontend/frontend_driver.c | 10 +++++++++-
 frontend/frontend_driver.h |  2 ++
 retroarch.c                |  9 +++------
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/frontend/frontend_driver.c b/frontend/frontend_driver.c
index 1af9e51288..b69c4d508b 100644
--- a/frontend/frontend_driver.c
+++ b/frontend/frontend_driver.c
@@ -119,5 +119,13 @@ int frontend_driver_parse_drive_list(void *data)
       return -1;
    return frontend->parse_drive_list(data);
 }
-#endif
 
+void frontend_driver_content_loaded(void)
+{
+   frontend_ctx_driver_t *frontend = frontend_get_ptr();
+
+   if (!frontend || !frontend->content_loaded)
+      return;
+   frontend->content_loaded();
+}
+#endif
diff --git a/frontend/frontend_driver.h b/frontend/frontend_driver.h
index c3c84a6751..f73ceae259 100644
--- a/frontend/frontend_driver.h
+++ b/frontend/frontend_driver.h
@@ -111,6 +111,8 @@ frontend_ctx_driver_t *frontend_ctx_init_first(void);
 
 int frontend_driver_parse_drive_list(void *data);
 
+void frontend_driver_content_loaded(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/retroarch.c b/retroarch.c
index b051798b76..66250ef44d 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1402,8 +1402,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
          if (!menu_load_content(CORE_TYPE_PLAIN))
             rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL);
 #endif
-         if (driver->frontend_ctx && driver->frontend_ctx->content_loaded)
-            driver->frontend_ctx->content_loaded();
+         frontend_driver_content_loaded();
          break;
 #ifdef HAVE_FFMPEG
       case RARCH_CTL_LOAD_CONTENT_FFMPEG:
@@ -1412,8 +1411,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
          if (!menu_load_content(CORE_TYPE_FFMPEG))
             rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL);
 #endif
-         if (driver->frontend_ctx && driver->frontend_ctx->content_loaded)
-            driver->frontend_ctx->content_loaded();
+         frontend_driver_content_loaded();
          break;
 #endif
       case RARCH_CTL_LOAD_CONTENT_IMAGEVIEWER:
@@ -1422,8 +1420,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
          if (!menu_load_content(CORE_TYPE_IMAGEVIEWER))
             rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL);
 #endif
-         if (driver->frontend_ctx && driver->frontend_ctx->content_loaded)
-            driver->frontend_ctx->content_loaded();
+         frontend_driver_content_loaded();
          break;
       case RARCH_CTL_MENU_RUNNING_FINISHED:
 #ifdef HAVE_MENU