diff options
| author | LPFaint99 <lpfaint99@gmail.com> | 2011-06-05 06:30:01 +0000 |
|---|---|---|
| committer | LPFaint99 <lpfaint99@gmail.com> | 2011-06-05 06:30:01 +0000 |
| commit | 2c4bc6d94c3b74f2f1f2e79e678a9118ef6106c5 (patch) | |
| tree | 1f8901838bb71cb1fd4170056fd3477692f62800 /Source/Core/DiscIO/Src/NANDContentLoader.cpp | |
| parent | 450b5c9c3372e2e403ec54e2f351421d97216a45 (diff) | |
fix a small oversight to changing NAND root, update locations of content.map and uid.sys
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7587 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO/Src/NANDContentLoader.cpp')
| -rw-r--r-- | Source/Core/DiscIO/Src/NANDContentLoader.cpp | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp index caae772283..3419ea98f0 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp @@ -28,9 +28,20 @@ namespace DiscIO { +CSharedContent *CSharedContent::m_Instance = NULL; +cUIDsys *cUIDsys::m_Instance = NULL; -CSharedContent CSharedContent::m_Instance; -cUIDsys cUIDsys::m_Instance; +CSharedContent& CSharedContent::AccessInstance() +{ + if (!m_Instance) m_Instance = new CSharedContent; + return *m_Instance; +} + +void CSharedContent::UpdateLocation() +{ + delete m_Instance; + m_Instance = new CSharedContent; +} CSharedContent::CSharedContent() { @@ -47,7 +58,10 @@ CSharedContent::CSharedContent() } CSharedContent::~CSharedContent() -{} +{ + delete m_Instance; + m_Instance = NULL; +} std::string CSharedContent::GetFilenameFromSHA1(u8* _pHash) { @@ -395,6 +409,18 @@ void CNANDContentLoader::RemoveTitle() const } } +cUIDsys& cUIDsys::AccessInstance() +{ + if (!m_Instance) m_Instance = new cUIDsys; + return *m_Instance; +} + +void cUIDsys::UpdateLocation() +{ + delete m_Instance; + m_Instance = new cUIDsys; +} + cUIDsys::cUIDsys() { sprintf(uidSys, "%ssys/uid.sys", File::GetUserPath(D_WIIUSER_IDX).c_str()); @@ -422,7 +448,10 @@ cUIDsys::cUIDsys() } cUIDsys::~cUIDsys() -{} +{ + delete m_Instance; + m_Instance = NULL; +} u32 cUIDsys::GetUIDFromTitle(u64 _Title) { |