UICommon/ResourcePack: Fix resource packs without manifests being able to crash dolphin

2019-01-02 22:47:18 +01:00 · 2019-01-02 22:47:18 +01:00 · c2c23677ed
parent aac17bf0d8
commit c2c23677ed
1 changed files with 8 additions and 1 deletions
--- a/Source/Core/UICommon/ResourcePack/Manager.cpp
+++ b/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");