diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-12-14 02:22:20 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-12-14 02:22:20 +0100 |
| commit | daf9d0eaa7e762ad8571f91a266098631b1843e6 (patch) | |
| tree | d0a707e4742f787f9769c0bbc2c0e0213bd22b48 /api/logic/meta/Index.cpp | |
| parent | f18afd3d1e73cc0020bfa1189e0b8fefc0f14e61 (diff) | |
| download | MultiMC-daf9d0eaa7e762ad8571f91a266098631b1843e6.tar MultiMC-daf9d0eaa7e762ad8571f91a266098631b1843e6.tar.gz MultiMC-daf9d0eaa7e762ad8571f91a266098631b1843e6.tar.lz MultiMC-daf9d0eaa7e762ad8571f91a266098631b1843e6.tar.xz MultiMC-daf9d0eaa7e762ad8571f91a266098631b1843e6.zip | |
NOISSUE do not override already loaded metadata entities with partial data
Diffstat (limited to 'api/logic/meta/Index.cpp')
| -rw-r--r-- | api/logic/meta/Index.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/logic/meta/Index.cpp b/api/logic/meta/Index.cpp index 0749651a..c67ab48c 100644 --- a/api/logic/meta/Index.cpp +++ b/api/logic/meta/Index.cpp @@ -103,7 +103,7 @@ void Index::parse(const QJsonObject& obj) parseIndex(obj, this); } -void Index::merge(const Ptr &other) +void Index::merge(const std::shared_ptr<Index> &other) { const QVector<VersionListPtr> lists = std::dynamic_pointer_cast<Index>(other)->m_lists; // initial load, no need to merge @@ -124,7 +124,7 @@ void Index::merge(const Ptr &other) { if (m_uids.contains(list->uid())) { - m_uids[list->uid()]->merge(list); + m_uids[list->uid()]->mergeFromIndex(list); } else { |