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
commit cc66f0336f

View File

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