This commit is contained in:
@@ -289,6 +289,12 @@ Public Class frmVariableManager
|
||||
Return False
|
||||
End If
|
||||
|
||||
If mgrVariables.GetReservedVariables.Contains(txtName.Text.ToUpper) Then
|
||||
mgrCommon.ShowMessage(frmVariableManager_ErrorVariableReserved, txtName.Text, MsgBoxStyle.Exclamation)
|
||||
txtName.Focus()
|
||||
Return False
|
||||
End If
|
||||
|
||||
Return True
|
||||
End Function
|
||||
|
||||
|
||||
@@ -501,6 +501,8 @@ Public Class mgrPath
|
||||
|
||||
Public Shared Function VerifyCustomVariables(ByVal hshScanlist As Hashtable, ByRef sGames As String) As Boolean
|
||||
Dim hshCustomVariables As Hashtable = mgrVariables.ReadVariables
|
||||
'Reserved variables will be resolved on Windows, but not on a Linux. Therefore we an ignore list here, otherwise GBM will bitch about them when using Windows configurations for Wine.
|
||||
Dim oReservedVariables As List(Of String) = mgrVariables.GetReservedVariables
|
||||
Dim sVariableCheck As String
|
||||
Dim sPattern As String = "\%(.*)\%"
|
||||
Dim oGame As clsGame
|
||||
@@ -511,7 +513,7 @@ Public Class mgrPath
|
||||
oMatch = Regex.Match(oGame.Path, sPattern)
|
||||
If oMatch.Success Then
|
||||
sVariableCheck = oMatch.Value.Replace("%", String.Empty)
|
||||
If Not hshCustomVariables.ContainsKey(sVariableCheck) Then
|
||||
If Not hshCustomVariables.ContainsKey(sVariableCheck) And Not oReservedVariables.Contains(sVariableCheck) Then
|
||||
sGames &= vbCrLf & oGame.Name & " (" & sVariableCheck & ")"
|
||||
bClean = False
|
||||
End If
|
||||
|
||||
@@ -154,4 +154,16 @@
|
||||
|
||||
Return hshList
|
||||
End Function
|
||||
|
||||
Public Shared Function GetReservedVariables() As List(Of String)
|
||||
Dim oList As New List(Of String)
|
||||
|
||||
oList.Add("APPDATA")
|
||||
oList.Add("LOCALAPPDATA")
|
||||
oList.Add("USERDOCUMENTS")
|
||||
oList.Add("COMMONDOCUMENTS")
|
||||
oList.Add("USERPROFILE")
|
||||
|
||||
Return oList
|
||||
End Function
|
||||
End Class
|
||||
|
||||
Generated
+9
@@ -5442,6 +5442,15 @@ Namespace My.Resources
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Looks up a localized string similar to [PARAM] is a reserved variable, you must enter a different name..
|
||||
'''</summary>
|
||||
Friend ReadOnly Property frmVariableManager_ErrorVariableReserved() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("frmVariableManager_ErrorVariableReserved", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Looks up a localized string similar to Custom Variable Manager.
|
||||
'''</summary>
|
||||
|
||||
@@ -2251,4 +2251,7 @@
|
||||
<data name="frmGameManager_WarningImportBackup" xml:space="preserve">
|
||||
<value>This feature is intended to import 7-Zip backup archives compatible with the selected game configuration.[BR][BR]GBM does NOT verify these files, you should only use files created by GBM or other compatible archives that were created using the same settings as the current game configuration.[BR][BR]This message will only be shown once.</value>
|
||||
</data>
|
||||
<data name="frmVariableManager_ErrorVariableReserved" xml:space="preserve">
|
||||
<value>[PARAM] is a reserved variable, you must enter a different name.</value>
|
||||
</data>
|
||||
</root>
|
||||
Reference in New Issue
Block a user