Skip to content

Commit

Permalink
Fix consecutive timed timelapses without postroll capture
Browse files Browse the repository at this point in the history
Due to the timer never properly resetting to None only one timelapse
was ever done.

Introduced in 7e2382f, covered until
315a80a.

Closes OctoPrint#1934
  • Loading branch information
foosel committed May 24, 2017
1 parent 3379571 commit 2a600d7
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions src/octoprint/timelapse.py
Original file line number Diff line number Diff line change
Expand Up @@ -703,10 +703,6 @@ def process_post_roll(self):
self._copying_postroll()
self.post_roll_finished()

def post_roll_finished(self):
Timelapse.post_roll_finished(self)
self._timer = None

def _timer_active(self):
return self._in_timelapse or self._postroll_captures > 0

Expand All @@ -719,6 +715,9 @@ def _on_timer_finished(self):
if self._capture_post_roll:
self.post_roll_finished()

# timer is done, delete it
self._timer = None


class TimelapseRenderJob(object):

Expand Down

0 comments on commit 2a600d7

Please sign in to comment.