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 2 additions and 2 deletions
Showing only changes of commit 0b48dc87b4 - Show all commits

View File

@ -245,9 +245,9 @@ intval._watchMicro = function (err, val) {
if (intval._state.micro.primed && !intval._state.micro.paused && (now - intval._state.frame.start) > intval._frame.open) { if (intval._state.micro.primed && !intval._state.micro.paused && (now - intval._state.frame.start) > intval._frame.open) {
intval._state.micro.primed = false intval._state.micro.primed = false
intval._state.micro.time = 0 intval._state.micro.time = 0
//setTimeout( () => { setTimeout( () => {
intval._stop() intval._stop()
//}, intval._microDelay) }, intval._microDelay)
} }
} }
} }