Skip to content

Commit d55aa38

Browse files
author
David Khristepher Santos
committed
Prevent Civitai Model loading from crashing application
1 parent 15ec970 commit d55aa38

1 file changed

Lines changed: 19 additions & 10 deletions

File tree

Diffusion.Toolkit/MainWindow.xaml.cs

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,24 +1045,33 @@ private void LoadModels()
10451045
Converters = { new JsonStringEnumConverter() }
10461046
};
10471047

1048-
var civitAiModels = JsonSerializer.Deserialize<LiteModelCollection>(json, options);
1049-
1050-
foreach (var model in civitAiModels.Models)
1048+
try
10511049
{
1052-
foreach (var modelVersion in model.ModelVersions)
1050+
var civitAiModels = JsonSerializer.Deserialize<LiteModelCollection>(json, options);
1051+
1052+
foreach (var model in civitAiModels.Models)
10531053
{
1054-
foreach (var versionFile in modelVersion.Files)
1054+
foreach (var modelVersion in model.ModelVersions)
10551055
{
1056-
otherModels.Add(new Model()
1056+
foreach (var versionFile in modelVersion.Files)
10571057
{
1058-
Filename = Path.GetFileNameWithoutExtension(versionFile.Name),
1059-
Hash = versionFile.Hashes.AutoV1,
1060-
SHA256 = versionFile.Hashes.SHA256,
1061-
});
1058+
otherModels.Add(new Model()
1059+
{
1060+
Filename = Path.GetFileNameWithoutExtension(versionFile.Name),
1061+
Hash = versionFile.Hashes.AutoV1,
1062+
SHA256 = versionFile.Hashes.SHA256,
1063+
});
1064+
}
10621065
}
1066+
10631067
}
10641068

10651069
}
1070+
catch (Exception ex)
1071+
{
1072+
Logger.Log(ex.Message);
1073+
}
1074+
10661075

10671076
}
10681077

0 commit comments

Comments
 (0)