#111 Remodel GUI work and split between threads: Make DLL behave more…

… like EXE
vpinball · Jul 13, 2024 · 2e9f626 · 2e9f626
1 parent 98332ce
commit 2e9f626
Show file tree

Hide file tree

Showing 8 changed files with 114 additions and 187 deletions.
diff --git a/b2sbackglassserver/b2sbackglassserver/Classes/B2SScreen.vb b/b2sbackglassserver/b2sbackglassserver/Classes/B2SScreen.vb
@@ -368,9 +368,9 @@ Public Class B2SScreen
             ((Me.DMDViewMode = eDMDViewMode.ShowDMD) OrElse
              (Me.DMDViewMode = eDMDViewMode.ShowDMDOnlyAtDefaultLocation AndAlso Me.DMDAtDefaultLocation) OrElse
              (Me.DMDViewMode = eDMDViewMode.DoNotShowDMDAtDefaultLocation AndAlso Not Me.DMDAtDefaultLocation)))
-#If B2S = "DLL" Then
+
         On Error Resume Next
-#End If
+
         ' get the correct screen
         Me.BackglassScreen = ScreensOrdered(0)
         Dim s As Screen
@@ -423,7 +423,7 @@ Public Class B2SScreen
             Me.formbackground.Size = Me.BackgroundSize
             Me.formbackground.Text = "B2S Backglass Server"
             Me.formbackground.BackColor = Color.Black
-            If (IO.File.Exists(Me.BackgroundPath)) Then
+            If (File.Exists(Me.BackgroundPath)) Then
                 Me.formbackground.BackgroundImage = Image.FromFile(Me.BackgroundPath) ' ("C:\backglass.png")
             End If
             Me.formbackground.Show()
@@ -515,7 +515,7 @@ Public Class B2SScreen
             formBackglass.Text = "B2S Backglass Server"
             formBackglass.Show()
         End If
-#If B2S = "DLL" Then
+#If B2S = "DLLBefore" Then
         ' bring backglass screen to the front
         If B2SSettings.FormToFront Then formBackglass.TopMost = True
         formBackglass.BringToFront()
@@ -529,7 +529,7 @@ Public Class B2SScreen
             Me.formDMD.ControlBox = False
             Me.formDMD.MaximizeBox = False
             Me.formDMD.MinimizeBox = False
-#If B2S = "DLL" Then
+#If B2S = "DLLBefore" Then
             Me.formDMD.Location = formBackglass.Location + Me.DMDLocation
 #Else
             Me.formDMD.Location = Me.BackglassScreen.Bounds.Location + DMDKeepBackglassLocation + Me.DMDLocation

diff --git a/b2sbackglassserver/b2sbackglassserver/Classes/B2SSettings.vb b/b2sbackglassserver/b2sbackglassserver/Classes/B2SSettings.vb
@@ -256,7 +256,7 @@ Public Class B2SSettings
     Public Shared Function GetSettingFilename() As String
         If IO.File.Exists(filename) Then
             Return filename
-#If B2S = "DLL" Then
+#If B2S = "DLLBefore" Then
         ElseIf StartAsEXE And B2STableSettingsExtendedPath And IO.File.Exists(IO.Path.Combine(Application.StartupPath(), filename)) Then
             Return IO.Path.Combine(Application.StartupPath(), filename)
 #Else