Prevent crash if clearing nonexistent scriptdelay

This commit is contained in:
JappaWakka 2025-02-22 12:41:38 +01:00
parent 0b82f53032
commit d01af0ad9d

View File

@ -98,22 +98,23 @@
Case "cleardelay" Case "cleardelay"
If argument <> "" Then If argument <> "" Then
Dim registerContent() As Object = ActionScript.GetRegisterValue("SCRIPTDELAY_" & argument) Dim registerContent() As Object = ActionScript.GetRegisterValue("SCRIPTDELAY_" & argument)
Dim delayType As String = CStr(registerContent(0)).GetSplit(0, ";") If registerContent(0) IsNot Nothing Then
Select Case delayType.ToLower Dim delayType As String = CStr(registerContent(0)).GetSplit(0, ";")
Case "steps" Select Case delayType.ToLower
Core.Player.ScriptDelaySteps = 0 Case "steps"
Core.Player.ScriptDelayDisplaySteps = False Core.Player.ScriptDelaySteps = 0
Case "itemcount" Core.Player.ScriptDelayDisplaySteps = False
Dim ItemDelayList As List(Of String) = Core.Player.ScriptDelayItems.Split(",").ToList Case "itemcount"
For Each entry As String In ItemDelayList Dim ItemDelayList As List(Of String) = Core.Player.ScriptDelayItems.Split(",").ToList
If entry.GetSplit(0, ",") = argument Then For Each entry As String In ItemDelayList
ItemDelayList.Remove(entry) If entry.GetSplit(0, ",") = argument Then
Exit For ItemDelayList.Remove(entry)
End If Exit For
Next End If
Core.Player.ScriptDelayItems = String.Join(";", ItemDelayList) Next
End Select Core.Player.ScriptDelayItems = String.Join(";", ItemDelayList)
End Select
End If
ActionScript.UnregisterID("SCRIPTDELAY_" & argument, "str") ActionScript.UnregisterID("SCRIPTDELAY_" & argument, "str")
ActionScript.UnregisterID("SCRIPTDELAY_" & argument) ActionScript.UnregisterID("SCRIPTDELAY_" & argument)
End If End If