Changes for issue #153
This commit is contained in:
@@ -78,7 +78,7 @@ Public Class mgrMonitorList
|
|||||||
Dim oCompareGame As clsGame
|
Dim oCompareGame As clsGame
|
||||||
Dim bIsDupe As Boolean
|
Dim bIsDupe As Boolean
|
||||||
|
|
||||||
sSQL = "Select * FROM monitorlist ORDER BY Name Asc"
|
sSQL = "SELECT * FROM monitorlist ORDER BY IsRegEx DESC"
|
||||||
oData = oDatabase.ReadParamData(sSQL, New Hashtable)
|
oData = oDatabase.ReadParamData(sSQL, New Hashtable)
|
||||||
|
|
||||||
For Each dr As DataRow In oData.Tables(0).Rows
|
For Each dr As DataRow In oData.Tables(0).Rows
|
||||||
|
|||||||
@@ -94,9 +94,15 @@ Public Class mgrProcessDetection
|
|||||||
|
|
||||||
For Each o As clsGame In hshScanList.Values
|
For Each o As clsGame In hshScanList.Values
|
||||||
sProcess = o.ProcessName.Split(":")(0)
|
sProcess = o.ProcessName.Split(":")(0)
|
||||||
If o.Duplicate = True And (sProcess = oGame.TrueProcess Or Regex.IsMatch(sProcess, oGame.TrueProcess)) Then
|
If o.Duplicate And o.IsRegEx Then
|
||||||
|
If Regex.IsMatch(prsFoundProcess.ProcessName, sProcess) Then
|
||||||
oInitialDupes.Add(o.ShallowCopy)
|
oInitialDupes.Add(o.ShallowCopy)
|
||||||
End If
|
End If
|
||||||
|
ElseIf o.Duplicate And Not o.IsRegEx Then
|
||||||
|
If sProcess = prsFoundProcess.ProcessName Then
|
||||||
|
oInitialDupes.Add(o.ShallowCopy)
|
||||||
|
End If
|
||||||
|
End If
|
||||||
Next
|
Next
|
||||||
|
|
||||||
For Each o As clsGame In oInitialDupes
|
For Each o As clsGame In oInitialDupes
|
||||||
|
|||||||
Reference in New Issue
Block a user