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
This commit is contained in:
Shawn Hoffman 2009-05-21 21:15:35 +00:00
parent 755d333f5a
commit bba8fd6481
2 changed files with 4 additions and 9 deletions

View File

@ -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;
}

View File

@ -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;