From bc8084fe75b407491cef13e895774ff04ee91fb2 Mon Sep 17 00:00:00 2001
From: dimok321 <15055714+dimok789@users.noreply.github.com>
Date: Sat, 13 Jun 2009 23:47:38 +0000
Subject: [PATCH] *Forgot something

---
 source/menu.cpp         | 13 ++++++-------
 source/usbloader/disc.c |  2 --
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/source/menu.cpp b/source/menu.cpp
index 90d41384..592d9eb4 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -1816,6 +1816,9 @@ int MainMenu(int menu)
 	delete cover;
 	delete coverImg;
 
+	ShutdownAudio();
+	StopGX();
+
 	int ret = 0;
     struct discHdr *header = &gameList[gameSelected];
 
@@ -1870,6 +1873,9 @@ int MainMenu(int menu)
     ret = Disc_Open();
     if(ret < 0) Sys_BackToLoader();
 
+    SDCard_deInit();
+	USBDevice_deInit();
+
     u8 errorfixer002 = 0;
     switch(fix002)
     {
@@ -1999,13 +2005,6 @@ int MainMenu(int menu)
                         break;
     }
 
-	ShutdownAudio();
-	StopGX();
-    SDCard_deInit();
-	USBDevice_deInit();
-    USBStorage_Deinit();
-    mload_close();
-
     ret = Disc_WiiBoot(videoselected, cheat, vipatch, Settings.patchcountrystrings, errorfixer002);
     if (ret < 0) {
         Sys_LoadMenu();
diff --git a/source/usbloader/disc.c b/source/usbloader/disc.c
index 51a6c9d9..a4d26b19 100644
--- a/source/usbloader/disc.c
+++ b/source/usbloader/disc.c
@@ -284,8 +284,6 @@ s32 Disc_BootPartition(u64 offset, u8 videoselected, u8 cheat, u8 vipatch, u8 pa
     WPAD_Flush(0);
     WPAD_Disconnect(0);
     WPAD_Shutdown();
-
-    WDVD_Close();
 
 	/* Shutdown IOS subsystems */
  	SYS_ResetSystem(SYS_SHUTDOWN, 0, 0);