ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3963 from JosJuice/banner-loaded-failure 

VolumeGC: Set m_banner_loaded when banner loading fails
This commit is contained in:
shuffle2 2016-10-03 06:33:52 -07:00 committed by GitHub
parent f121fa07c2 202c9d58cd
commit cc66f0336f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DiscIO/VolumeGC.cpp
View File

@ -206,6 +206,8 @@ void CVolumeGC::LoadBannerFile() const
if (m_banner_loaded) if (m_banner_loaded)
return; return;
m_banner_loaded = true;
GCBanner banner_file; GCBanner banner_file;
std::unique_ptr<IFileSystem> file_system(CreateFileSystem(this)); std::unique_ptr<IFileSystem> file_system(CreateFileSystem(this));
size_t file_size = (size_t)file_system->GetFileSize("opening.bnr"); size_t file_size = (size_t)file_system->GetFileSize("opening.bnr");
@ -236,7 +238,6 @@ void CVolumeGC::LoadBannerFile() const
} }
ExtractBannerInformation(banner_file, is_bnr1); ExtractBannerInformation(banner_file, is_bnr1);
m_banner_loaded = true;
} }
void CVolumeGC::ExtractBannerInformation(const GCBanner& banner_file, bool is_bnr1) const void CVolumeGC::ExtractBannerInformation(const GCBanner& banner_file, bool is_bnr1) const