summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/NANDContentLoader.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2015-03-09 16:08:32 +0100
committerJosJuice <josjuice@gmail.com>2015-03-09 16:08:32 +0100
commit66bb3000c25b98db9eeac84fdf27d1daa8afbe12 (patch)
treec38f7dd095742b54bb5c6d6e23af3f145adee1ea /Source/Core/DiscIO/NANDContentLoader.cpp
parentd92efc4a3e3fb78f253e10dfd14b9abf2ff5a36d (diff)
Don't construct NANDContentLoader classes before Main.cpp runs
The cUIDsys constructor writes to <Wii user path>/sys/uid.sys. This must not be done before Main.cpp sets the correct user paths.
Diffstat (limited to 'Source/Core/DiscIO/NANDContentLoader.cpp')
-rw-r--r--Source/Core/DiscIO/NANDContentLoader.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/Source/Core/DiscIO/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp
index 8da2cd65d8..830a9d75ff 100644
--- a/Source/Core/DiscIO/NANDContentLoader.cpp
+++ b/Source/Core/DiscIO/NANDContentLoader.cpp
@@ -25,9 +25,6 @@
namespace DiscIO
{
-CSharedContent CSharedContent::m_Instance;
-cUIDsys cUIDsys::m_Instance;
-
CSharedContent::CSharedContent()
{
@@ -306,9 +303,6 @@ DiscIO::IVolume::ECountry CNANDContentLoader::GetCountry() const
}
-CNANDContentManager CNANDContentManager::m_Instance;
-
-
CNANDContentManager::~CNANDContentManager()
{
for (auto& entry : m_Map)