small tweaks to discscrubber...32bit seems to make a fine scrub job, but fails to actually compress.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3270 8ced0084-cf51-0410-be5f-012b33b47a6e

2 files changed, 4 insertions, 9 deletions

diff --git a/Source/Core/DiscIO/Src/CompressedBlob.cpp b/Source/Core/DiscIO/Src/CompressedBlob.cpp
index eb340ea216..387a0bee47 100644
--- a/Source/Core/DiscIO/Src/CompressedBlob.cpp
+++ b/Source/Core/DiscIO/Src/CompressedBlob.cpp
@@ -168,14 +168,7 @@ bool CompressFileToBlob(const char* infile, const char* outfile, u32 sub_type,
 
 	if (sub_type == 1)
 	{
-		if (PanicYesNo("WARNING - Scrubbing Wii disc %s will permanently remove garbage data.\n"
-			"This should be 100%% OK, but you have the option to opt out.\n\n\n"
-			"Would you like to scrub it?", infile))
-		{
-			if (!DiscScrubber::Scrub(infile, callback, arg))
-				return false;
-		}
-		else
+		if (!DiscScrubber::Scrub(infile, callback, arg))
 			return false;
 	}
 
@@ -246,7 +239,7 @@ bool CompressFileToBlob(const char* infile, const char* outfile, u32 sub_type,
 
 		if (retval != Z_OK)
 		{
-			PanicAlert("Deflate failed");
+			ERROR_LOG(DISCIO, "Deflate failed");
 			goto cleanup;
 		}
 
diff --git a/Source/Core/DiscIO/Src/DiscScrubber.cpp b/Source/Core/DiscIO/Src/DiscScrubber.cpp
index 3ae87091b5..1cc958a3dc 100644
--- a/Source/Core/DiscIO/Src/DiscScrubber.cpp
+++ b/Source/Core/DiscIO/Src/DiscScrubber.cpp
@@ -375,6 +375,8 @@ void ParsePartitionData(SPartition& _rPartition)
 			, (*Files.at(currentFile)).m_Offset, (*Files.at(currentFile)).m_FileSize);
 	}
 
+	delete FileSystem;
+
 	// Swap back
 	delete m_Disc;
 	m_Disc = OldVolume;