Skip to content

Commit fa6d774

Browse files
Add null check when importing xml file as capabilities may not be present
1 parent 2fe4445 commit fa6d774

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

‎libEDSsharp/Bridge.cs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -428,18 +428,20 @@ public EDSsharp convert(Device dev)
428428

429429
Dictionary<string, string> keypairs = new Dictionary<string, string>();
430430

431-
432-
if (dev.Other.Capabilities.CharacteristicsList != null)
431+
if (dev.Other.Capabilities != null)
433432
{
434-
foreach (Characteristic c in dev.Other.Capabilities.CharacteristicsList.Characteristic)
433+
if (dev.Other.Capabilities.CharacteristicsList != null)
435434
{
436-
try
435+
foreach (Characteristic c in dev.Other.Capabilities.CharacteristicsList.Characteristic)
437436
{
438-
keypairs.Add(c.CharacteristicName.Label.Text, c.CharacteristicContent.Label.Text);
439-
}
440-
catch (Exception e)
441-
{
442-
// Warnings.warning_list.Add("Parsing characteristics failed " + e.ToString());
437+
try
438+
{
439+
keypairs.Add(c.CharacteristicName.Label.Text, c.CharacteristicContent.Label.Text);
440+
}
441+
catch (Exception e)
442+
{
443+
// Warnings.warning_list.Add("Parsing characteristics failed " + e.ToString());
444+
}
443445
}
444446
}
445447
}

0 commit comments

Comments
 (0)