From 66bb3000c25b98db9eeac84fdf27d1daa8afbe12 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 9 Mar 2015 16:08:32 +0100 Subject: Don't construct NANDContentLoader classes before Main.cpp runs The cUIDsys constructor writes to /sys/uid.sys. This must not be done before Main.cpp sets the correct user paths. --- Source/Core/DiscIO/NANDContentLoader.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'Source/Core/DiscIO/NANDContentLoader.cpp') 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) -- cgit v1.2.3