CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'catpacks' of github.com:Trial97/PrismLauncher into catpacks

Browse Source
This commit is contained in:
Trial97 2023-07-02 13:34:41 +03:00
commit 6fc745e98c
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
launcher/ui/themes/CatPack.cpp
View File

@ -78,7 +78,8 @@ JsonCatPack::JsonCatPack(QFileInfo& manifestInfo) : BasicCatPack(manifestInfo.di
const auto root = doc.object();
m_name = Json::requireString(root, "name", "Catpack name");
auto id = Json::ensureString(root, "id", "", "Catpack ID");
m_id = id.isEmpty() ? m_id : id;
if (!id.isEmpty())
m_id = id;
m_defaultPath = FS::PathCombine(path, Json::requireString(root, "default", "Deafult Cat"));
auto variants = Json::ensureArray(root, "variants", QJsonArray(), "Catpack Variants");
for (auto v : variants) {