From 5209abeb03a6c8ead889d92128a17b3e474fedb2 Mon Sep 17 00:00:00 2001 From: comex Date: Sat, 31 Aug 2013 23:39:26 -0400 Subject: Better error reporting for ES / NANDContentLoader. --- Source/Core/DiscIO/Src/NANDContentLoader.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'Source/Core/DiscIO/Src/NANDContentLoader.cpp') diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp index b0dcd302f7..974f8a9945 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp @@ -213,8 +213,8 @@ bool CNANDContentLoader::Initialize(const std::string& _rName) File::IOFile pTMDFile(TMDFileName, "rb"); if (!pTMDFile) { - DEBUG_LOG(DISCIO, "CreateFromDirectory: error opening %s", - TMDFileName.c_str()); + WARN_LOG(DISCIO, "CreateFromDirectory: error opening %s", + TMDFileName.c_str()); return false; } u32 pTMDSize = (u32)File::GetSize(TMDFileName); @@ -222,8 +222,7 @@ bool CNANDContentLoader::Initialize(const std::string& _rName) pTMDFile.ReadBytes(pTMD, (size_t)pTMDSize); pTMDFile.Close(); } - if (!pTMD) - return false; + memcpy(m_TMDView, pTMD + 0x180, TMD_VIEW_SIZE); memcpy(m_TMDHeader, pTMD, TMD_HEADER_SIZE); @@ -276,7 +275,10 @@ bool CNANDContentLoader::Initialize(const std::string& _rName) } // Be graceful about incorrect tmds. - rContent.m_Size = (u32) File::GetSize(rContent.m_Filename); + if (File::Exists(rContent.m_Filename)) + { + rContent.m_Size = (u32) File::GetSize(rContent.m_Filename); + } } delete [] pTMD; -- cgit v1.2.3