From 2a600d7d003f570fce8fb50a2220f5534039cc95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <gina@octoprint.org>
Date: Wed, 24 May 2017 11:57:02 +0200
Subject: [PATCH] Fix consecutive timed timelapses without postroll capture

Due to the timer never properly resetting to None only one timelapse
was ever done.

Introduced in 7e2382fed4199ee50db14e40cc8b03c694894a04, covered until
315a80a7a7f7336747937e1b17b9706e77859cff.

Closes #1934
---
 src/octoprint/timelapse.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/octoprint/timelapse.py b/src/octoprint/timelapse.py
index a8aead7d..63642e94 100644
--- a/src/octoprint/timelapse.py
+++ b/src/octoprint/timelapse.py
@@ -703,10 +703,6 @@ class TimedTimelapse(Timelapse):
 		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
 
@@ -719,6 +715,9 @@ class TimedTimelapse(Timelapse):
 		if self._capture_post_roll:
 			self.post_roll_finished()
 
+		# timer is done, delete it
+		self._timer = None
+
 
 class TimelapseRenderJob(object):