From c0b85ba34a748453798f5122e677020b5fc4df77 Mon Sep 17 00:00:00 2001
From: Twinaphex <libretro@gmail.com>
Date: Fri, 17 Oct 2014 00:21:02 +0200
Subject: [PATCH] Make apply_deferred_settings more robust when it's being
 called when exiting

---
 frontend/menu/menu_common.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index 2328d03f99..a4702b5349 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -308,7 +308,15 @@ static unsigned input_frame(uint64_t trigger_state)
 
 void apply_deferred_settings(void)
 {
-   rarch_setting_t *setting = driver.menu->list_settings;
+   rarch_setting_t *setting = NULL;
+    
+   if (!driver.menu)
+      return;
+    
+   setting = (rarch_setting_t*)driver.menu->list_settings;
+    
+   if (!setting)
+      return;
 
    for (; setting->type != ST_NONE; setting++)
    {