Merge pull request #7668 from spycrab/rpack_fix
UICommon/ResourcePack: Fix packs without manifests crashing Dolphin
This commit is contained in:
commit
931af76da3
|
@ -54,7 +54,11 @@ bool Init()
|
|||
{
|
||||
const auto& path = pack_list[i];
|
||||
|
||||
error |= !Add(path);
|
||||
if (!Add(path))
|
||||
{
|
||||
error = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
order->Set(packs[i].GetManifest()->GetID(), static_cast<u64>(i));
|
||||
}
|
||||
|
@ -107,6 +111,9 @@ bool Add(const std::string& path, int offset)
|
|||
|
||||
ResourcePack pack(path);
|
||||
|
||||
if (!pack.IsValid())
|
||||
return false;
|
||||
|
||||
IniFile file = GetPackConfig();
|
||||
|
||||
auto* order = file.GetOrCreateSection("Order");
|
||||
|
|
Loading…
Reference in New Issue