From: daid <daid303@gmail.com>
Date: Tue, 3 Dec 2013 10:34:36 +0000 (+0100)
Subject: Fix the default timelaps filename.
X-Git-Tag: 14.01~41
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=00bef9270a3fc1dc6feac0e371dd98d571fd5718;p=cura.git

Fix the default timelaps filename.
---

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index 4160e326..4f94191a 100644
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@ -361,7 +361,7 @@ class printWindow(wx.Frame):
 			self.camPage.SetSizer(sizer)
 
 			self.timelapsEnable = wx.CheckBox(self.camPage, -1, _("Enable timelapse movie recording"))
-			self.timelapsSavePath = wx.TextCtrl(self.camPage, -1, os.path.expanduser('~/timelaps_' + datetime.datetime.now().strftime('%Y-%m-%d_%H:%M') + '.mpg'))
+			self.timelapsSavePath = wx.TextCtrl(self.camPage, -1, os.path.expanduser('~/timelaps_' + datetime.datetime.now().strftime('%Y-%m-%d_%H-%M') + '.mpg'))
 			sizer.Add(self.timelapsEnable, pos=(0, 0), span=(1, 2), flag=wx.EXPAND)
 			sizer.Add(self.timelapsSavePath, pos=(1, 0), span=(1, 2), flag=wx.EXPAND)
 
@@ -433,7 +433,7 @@ class printWindow(wx.Frame):
 		self.directControlPanel.Enable(
 			self.machineCom is not None and self.machineCom.isOperational() and not self.machineCom.isPrinting())
 		self.machineLogButton.Show(self.machineCom is not None and self.machineCom.isClosedOrError())
-		if self.cam != None:
+		if self.cam is not None:
 			for button in self.cam.buttons:
 				button.Enable(self.machineCom is None or not self.machineCom.isPrinting())