Skip to content

Commit eed3f36

Browse files
mohnjilesclaude
andcommitted
Handle null returns in CivitAI base model type fallback chain
- Chain '?? []' so an all-null fallback can't NRE on Count - Null-conditional access on enumsResponse in case the API returns 204 Addresses gemini-code-assist review comments on LykosAI#1239. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent b3bbcee commit eed3f36

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

StabilityMatrix.Avalonia/Services/CivitBaseModelTypeService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public async Task<List<string>> GetBaseModelTypes(bool forceRefresh = false, boo
9999
if (civitBaseModels.Count <= 0)
100100
{
101101
civitBaseModels =
102-
await TryGetBaseModelsFromEnumsEndpoint() ?? await TryGetLegacyBaseModelList();
102+
await TryGetBaseModelsFromEnumsEndpoint() ?? await TryGetLegacyBaseModelList() ?? [];
103103

104104
civitBaseModels =
105105
civitBaseModels.Count > 0 ? civitBaseModels : GetKnownVisibleBaseModelTypes();
@@ -143,7 +143,7 @@ public void ClearCache()
143143
try
144144
{
145145
var enumsResponse = await civitApi.GetEnums();
146-
var baseModels = enumsResponse.ActiveBaseModel ?? enumsResponse.BaseModel;
146+
var baseModels = enumsResponse?.ActiveBaseModel ?? enumsResponse?.BaseModel;
147147

148148
if (baseModels is { Count: > 0 })
149149
{

0 commit comments

Comments
 (0)