Fixup unreliable XML chan list read bug

labstreaminglayer · Sep 10, 2022 · a3096a9 · a3096a9
1 parent 1d4ac03
commit a3096a9
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/Runtime/Scripts/BaseInlet.cs b/Runtime/Scripts/BaseInlet.cs
@@ -77,21 +77,23 @@ public virtual void AStreamIsFound(StreamInfo stream_info)
             single_sample = new TData[nChannels];
 
             XMLElement channels = inlet.info().desc().child("channels");
+            XMLElement chan;
             if (!channels.empty())
+                chan = channels.first_child();
+            else
+                chan = channels;
+
+            ChannelNames.Clear();
+            for (int chan_ix = 0; chan_ix < nChannels; chan_ix++)
             {
-
-                XMLElement chan = channels.first_child();
-                while (!chan.empty())
+                if (!chan.empty())
                 {
-                    // Read chan
                     ChannelNames.Add(chan.child_value("label"));
                     chan = chan.next_sibling();
                 }
-            }
-            // Pad with empty strings to make ChannelNames length == nChannels.
-            for (int chan_ix = ChannelNames.Count; chan_ix < nChannels; chan_ix++)
-            {
-                ChannelNames.Add("Chan" + chan_ix);
+                else
+                    // Pad with empty strings to make ChannelNames length == nChannels.
+                    ChannelNames.Add("Chan" + chan_ix);
             }
 
             OnStreamAvailable();