Merge branch 'master' into 76-events-of-overlapping-pictures-get-merged

vpinball · Apr 1, 2024 · e7daf9e · e7daf9e
2 parents 3e3fff1 + fedb1b0
commit e7daf9e
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 19 deletions.
diff --git a/b2s_screenresidentifier/b2s_screenresidentifier/B2S_ScreenResIdentifier.vb b/b2s_screenresidentifier/b2s_screenresidentifier/B2S_ScreenResIdentifier.vb
@@ -1,10 +1,8 @@
 Imports System
 Imports System.Drawing
 Imports System.IO
-Imports System.Security.Principal
 Imports System.Windows.Forms
 Imports Microsoft.Win32
-Imports MessageBox = System.Windows.MessageBox
 
 Module B2S_ScreenResIdentifier
     Sub Main()
@@ -18,9 +16,4 @@ Module B2S_ScreenResIdentifier
         Application.SetCompatibleTextRenderingDefault(False)
         Application.Run(New formPlayfield())
     End Sub
-    Private Function IsAdmin() As Boolean
-        Dim identity As WindowsIdentity = WindowsIdentity.GetCurrent()
-        Dim principal As New WindowsPrincipal(identity)
-        Return principal.IsInRole(WindowsBuiltInRole.Administrator)
-    End Function
 End Module
diff --git a/b2sbackglassserverexe/b2sbackglassserverexe/Classes/B2SBackglassServerEXE.vb b/b2sbackglassserverexe/b2sbackglassserverexe/Classes/B2SBackglassServerEXE.vb
@@ -1,23 +1,13 @@
 Imports System
 Imports System.Drawing
 Imports System.IO
-Imports System.Security.Principal
 Imports System.Windows.Forms
 Imports Microsoft.Win32
 
 Module B2SBackglassServerEXE
     Sub Main()
-        'If IsAdmin() Then
-        '    MessageBox.Show("You should not start this as Administrator!", My.Resources.AppTitle, MessageBoxButtons.OK, MessageBoxIcon.Stop)
-        '    Exit Sub
-        'End If
         Application.EnableVisualStyles()
         Application.SetCompatibleTextRenderingDefault(False)
         Application.Run(New formBackglass())
     End Sub
-    Private Function IsAdmin() As Boolean
-        Dim identity As WindowsIdentity = WindowsIdentity.GetCurrent()
-        Dim principal As New WindowsPrincipal(identity)
-        Return principal.IsInRole(WindowsBuiltInRole.Administrator)
-    End Function
 End Module
diff --git a/b2sbackglassserverexe/b2sbackglassserverexe/Forms/formBackglass.vb b/b2sbackglassserverexe/b2sbackglassserverexe/Forms/formBackglass.vb
@@ -1801,8 +1801,6 @@ Public Class formBackglass
                 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 = topnode.SelectSingleNode("MergeBulbs") IsNot Nothing AndAlso topnode.SelectSingleNode("MergeBulbs").Attributes("Value").InnerText <> "0"
-
                 ' clear all data
                 B2SData.ClearAll(True)