Commit9264132

authored

fix: crash caused by funscripts with actions after their stated duration (#1764)

Co-authored-by: crwxaj <crwxaj>

1 parent41ee63b commit9264132Copy full SHA for 9264132

File tree

-4

lines changed

-4

lines changed

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -260,12 +260,15 @@ func (funscript Script) getDuration() float64 {`
`260`	`260`	`maxts:=funscript.Actions[len(funscript.Actions)-1].At`
`261`	`261`	`duration:=float64(maxts)/1000.0`
`262`	`262`
`263`		`-iffunscript.Metadata!=nil&&float64(funscript.Metadata.Duration)>duration{`
`264`		`-duration=float64(funscript.Metadata.Duration)`
	`263`	`+iffunscript.Metadata!=nil {`
	`264`	`+metadataDuration:=float64(funscript.Metadata.Duration)`
`265`	`265`
`266`		`-ifduration>50000 {`
	`266`	`+ifmetadataDuration>50000 {`
`267`	`267`	`// large values are likely in milliseconds`
`268`		`-duration=duration/1000.0`
	`268`	`+metadataDuration=metadataDuration/1000.0`
	`269`	`+}`
	`270`	`+ifmetadataDuration>duration {`
	`271`	`+duration=metadataDuration`
`269`	`272`	`}`
`270`	`273`	`}`
`271`	`274`	`returnduration`

Comments

(0)