Skip to content
Permalink
Browse files

Merge pull request #7668 from spycrab/rpack_fix

UICommon/ResourcePack: Fix packs without manifests crashing Dolphin
  • Loading branch information...
lioncash committed Jan 3, 2019
2 parents a8e5f2b + c2c2367 commit 931af76da322129da54b4361bc18ba772610c5fd
Showing with 8 additions and 1 deletion.
  1. +8 −1 Source/Core/UICommon/ResourcePack/Manager.cpp
@@ -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");

0 comments on commit 931af76

Please sign in to comment.
You can’t perform that action at this time.