Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
1 changed files with 6 additions and 2 deletions
Showing only changes of commit 736a0c858b - Show all commits

View File

@ -287,9 +287,13 @@ intval.frame = function (dir = null, time = null) {
if (time !== 0) {
setTimeout(intval._pause, intval._state.frame.open)
if (dir) {
setTimeout(intval._startFwd, (time - intval._state.frame.open))
log.info('frame', { pausing : time - intval._state.frame.open })
setTimeout(() => {
log.info('frame', 'restarting after pause')
intval._startFwd()
}, time - intval._state.frame.open)
} else {
setTimeout(intval._startBwd, (time - intval._state.frame.open))
setTimeout(intval._startBwd, time - intval._state.frame.open)
}
}
}