diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-07-02 13:34:41 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-07-02 13:34:41 +0300 |
| commit | 6fc745e98c375e5364f3e1d2e83c14cbb3d95394 (patch) | |
| tree | e13a1f205b349f95f56490053dfb6916c24a5746 | |
| parent | 7579fff532629643384d9b8011e885028ca9a8f0 (diff) | |
| parent | c5ea8367aaf9d61a6362427a55206d8891f40cda (diff) | |
| download | PrismLauncher-6fc745e98c375e5364f3e1d2e83c14cbb3d95394.tar.gz PrismLauncher-6fc745e98c375e5364f3e1d2e83c14cbb3d95394.tar.bz2 PrismLauncher-6fc745e98c375e5364f3e1d2e83c14cbb3d95394.zip | |
Merge branch 'catpacks' of github.com:Trial97/PrismLauncher into catpacks
| -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 a0b06a60..4170febd 100644 --- a/launcher/ui/themes/CatPack.cpp +++ b/launcher/ui/themes/CatPack.cpp @@ -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) { |