External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-30 12:17:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'MultiMC:develop' into develop

Browse Source
This commit is contained in:
Sebastian
2022-05-29 01:14:22 -05:00
committed by GitHub
parent 11383e2be4 66c6e6e05d
commit d3d3ddb446
16 changed files with 68 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/ui/dialogs/UpdateDialog.cpp
View File

@@ -81,7 +81,7 @@ QString reprocessCommits(QByteArray json)
for(int i = commitarray.size() - 1; i >= 0; i--)
{
const auto & commitval = commitarray[i];
auto commitobj = Json::requireObject(commitval);
auto commitobj = Json::requireValueObject(commitval);
auto parents_info = Json::ensureArray(commitobj, "parents");
// NOTE: this ignores merge commits, because they have more than one parent
if(parents_info.size() > 1)