From 0389474e12c05509efd5b5f4339fe838d6794b2d Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 6 Dec 2015 18:15:00 +0100
Subject: [PATCH] Set dangling pointers to null for RARCH_DISPLAY_CTL_DEINIT
 and RARCH_AUDIO_CTL_DEINIT too

---
 audio/audio_driver.c | 7 ++++++-
 gfx/video_driver.c   | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index 9be76bf6c9..411dadae57 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -782,7 +782,12 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
          audio_driver_context_audio_data = NULL;
          break;
       case RARCH_AUDIO_CTL_DEINIT:
-         return uninit_audio();
+         if (uninit_audio())
+         {
+            audio_driver_context_audio_data = NULL;
+            return true;
+         }
+         break;
       case RARCH_AUDIO_CTL_SETUP_REWIND:
          audio_driver_setup_rewind();
          return true;
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 9ef1a6ca67..4fc1087728 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -1491,7 +1491,9 @@ bool video_driver_ctl(enum rarch_display_ctl_state state, void *data)
          video_driver_data = NULL;
          break;
       case RARCH_DISPLAY_CTL_DEINIT:
-         return uninit_video_input();
+         uninit_video_input();
+         video_driver_data = NULL;
+         return true;
       case RARCH_DISPLAY_CTL_MONITOR_RESET:
          video_driver_state.frame_time_samples_count = 0;
          return true;