Fix more of what I broke.

This commit is contained in:
Jordan Woyak
2013-03-03 16:51:26 -06:00
parent b1a2915304
commit c07b8a6e37
8 changed files with 97 additions and 61 deletions

View File

@ -16,6 +16,7 @@
// http://code.google.com/p/dolphin-emu/
#include "VolumeWiiCrypted.h"
#include "VolumeGC.h"
#include "StringUtil.h"
#include "Crypto/sha1.h"
@ -171,12 +172,12 @@ std::string CVolumeWiiCrypted::GetMakerID() const
std::vector<std::string> CVolumeWiiCrypted::GetNames() const
{
std::vector<std::string> names;
auto const string_decoder = CVolumeGC::GetStringDecoder(GetCountry());
char name[0xFF] = {};
if (m_pReader != NULL && Read(0x20, 0x60, (u8*)&name))
{
names.push_back(name);
}
names.push_back(string_decoder(name));
return names;
}