Skip to content

Fix: NullReferenceException in Satellite Service on unknown types #441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amadeo-alex merged 1 commit into from
Mar 22, 2026
Merged

Fix: NullReferenceException in Satellite Service on unknown types #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/HASS.Agent/HASS.Agent.Satellite.Service/Settings/StoredCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using HASS.Agent.Shared.Enums;
using HASS.Agent.Shared.Enums;
using HASS.Agent.Shared.Models.Config;
using HASS.Agent.Shared.HomeAssistant.Commands;
using HASS.Agent.Shared.HomeAssistant.Commands.CustomCommands;
Expand Down Expand Up @@ -56,7 +56,10 @@ internal static async Task<bool> LoadAsync()
// convert to abstract commands
await Task.Run(delegate
{
foreach (var abstractCommand in configuredCommands.Select(ConvertConfiguredToAbstract)) Variables.Commands.Add(abstractCommand!);
foreach (var abstractCommand in configuredCommands.Select(ConvertConfiguredToAbstract))
{
if (abstractCommand != null) Variables.Commands.Add(abstractCommand);
}
});

// all good
Expand Down
14 changes: 11 additions & 3 deletions src/HASS.Agent/HASS.Agent.Satellite.Service/Settings/StoredSensors.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using HASS.Agent.Shared.Enums;
using HASS.Agent.Shared.Enums;
using HASS.Agent.Shared.Models.Config;
using HASS.Agent.Satellite.Service.Extensions;
using HASS.Agent.Shared.HomeAssistant.Sensors;
Expand Down Expand Up @@ -61,8 +61,16 @@ await Task.Run(delegate
{
foreach (var sensor in configuredSensors)
{
if (sensor.IsSingleValue()) Variables.SingleValueSensors.Add(ConvertConfiguredToAbstractSingleValue(sensor)!);
else Variables.MultiValueSensors.Add(ConvertConfiguredToAbstractMultiValue(sensor)!);
if (sensor.IsSingleValue())
{
var abstractSensor = ConvertConfiguredToAbstractSingleValue(sensor);
if (abstractSensor != null) Variables.SingleValueSensors.Add(abstractSensor);
}
else
{
var abstractSensor = ConvertConfiguredToAbstractMultiValue(sensor);
if (abstractSensor != null) Variables.MultiValueSensors.Add(abstractSensor);
}
}
});

Expand Down