From a261896186fa6f853a6ff46295cf28b888cbf6e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Sat, 9 Mar 2013 12:58:15 +0100
Subject: [PATCH] Fixed using wrong item collection for timelapse files, lead
 to always displaying all files, not just the ones of the current page.

---
 octoprint/templates/index.html | 2 +-
 octoprint/timelapse.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/octoprint/templates/index.html b/octoprint/templates/index.html
index 57e2674..3bb10d1 100644
--- a/octoprint/templates/index.html
+++ b/octoprint/templates/index.html
@@ -482,7 +482,7 @@
                                     <th class="timelapse_files_action">Action</th>
                                 </tr>
                                 </thead>
-                                <tbody data-bind="foreach: listHelper.items">
+                                <tbody data-bind="foreach: listHelper.paginatedItems">
                                 <tr data-bind="attr: {title: name}">
                                     <td class="timelapse_files_name" data-bind="text: name"></td>
                                     <td class="timelapse_files_size" data-bind="text: size"></td>
diff --git a/octoprint/timelapse.py b/octoprint/timelapse.py
index d8dcdce..49b2063 100644
--- a/octoprint/timelapse.py
+++ b/octoprint/timelapse.py
@@ -106,7 +106,7 @@ class Timelapse(object):
 				# Because ffmpeg hiccups on windows' drive letters and backslashes we have to give the watermark
 				# path a special treatment. Yeah, I couldn't believe it either...
 				watermark = watermark.replace("\\", "/").replace(":", "\\\\:")
-			command.extend(['-vf', 'movie=%s [wm]; [in][wm] overlay=10:main_h-overlay_h-10 [out]' % (watermark)])
+			command.extend(['-vf', 'movie=%s [wm]; [in][wm] overlay=10:main_h-overlay_h-10 [out]' % watermark])
 
 		# finalize command with output file
 		command.append(output)