Revert mergeBulbs

vpinball · May 9, 2024 · ca2e764 · ca2e764
1 parent af0c3cd
commit ca2e764
Show file tree

Hide file tree

Showing 2 changed files with 355 additions and 346 deletions.
diff --git a/b2sbackglassserver/b2sbackglassserver/Forms/formBackglass.vb b/b2sbackglassserver/b2sbackglassserver/Forms/formBackglass.vb
@@ -773,7 +773,11 @@ Public Class formBackglass
 
                 ' get top node
                 Dim topnode As Xml.XmlElement = XML.SelectSingleNode("DirectB2SData")
-                Dim mergeBulbs As Boolean = topnode.SelectSingleNode("MergeBulbs") IsNot Nothing AndAlso topnode.SelectSingleNode("MergeBulbs").Attributes("Value").InnerText <> "0"
+                Dim mergeBulbs As Boolean = True
+
+                If topnode.SelectSingleNode("MergeBulbs") IsNot Nothing Then
+                    mergeBulbs = topnode.SelectSingleNode("MergeBulbs").Attributes("Value").InnerText <> "0"
+                End If
 
                 ' clear all data
                 B2SData.ClearAll(True)