diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-23 11:44:40 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-23 11:44:40 +0300 |
| commit | f8adb508ab0152af76829e0fdee92b451dcc1acf (patch) | |
| tree | 5b211ee0b3bb92f4dd2491276548963a5f3cc83e /launcher/ui | |
| parent | 6613deca0fa3a49086e89bc05e047f05909f8c0c (diff) | |
| download | PrismLauncher-f8adb508ab0152af76829e0fdee92b451dcc1acf.tar.gz PrismLauncher-f8adb508ab0152af76829e0fdee92b451dcc1acf.tar.bz2 PrismLauncher-f8adb508ab0152af76829e0fdee92b451dcc1acf.zip | |
Made catpack id optional in catpack.json
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/ui')
| -rw-r--r-- | launcher/ui/themes/CatPack.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/launcher/ui/themes/CatPack.cpp b/launcher/ui/themes/CatPack.cpp index e74b9709..2d5653a6 100644 --- a/launcher/ui/themes/CatPack.cpp +++ b/launcher/ui/themes/CatPack.cpp @@ -77,7 +77,8 @@ JsonCatPack::JsonCatPack(QFileInfo& manifestInfo) : BasicCatPack(manifestInfo.di auto doc = Json::requireDocument(manifestInfo.absoluteFilePath(), "CatPack JSON file"); const auto root = doc.object(); m_name = Json::requireString(root, "name", "Catpack name"); - m_id = Json::requireString(root, "id", "Catpack ID"); + auto id = Json::ensureString(root, "id", "", "Catpack ID"); + m_id = 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) { |