chiark / gitweb /
Fixed the print window does not open bug!.
authordaid303 <daid303@gmail.com>
Mon, 12 Nov 2012 08:58:40 +0000 (09:58 +0100)
committerdaid303 <daid303@gmail.com>
Mon, 12 Nov 2012 08:58:40 +0000 (09:58 +0100)
Cura/gui/printWindow.py

index 9047e9e3f13d78efc051fbb459a839f708e4a42b..646992d5501c4a9f3d866ce6cfa9611b390dffdc 100644 (file)
@@ -103,6 +103,8 @@ class printWindow(wx.Frame):
                self.cam = None\r
                if webcam.hasWebcamSupport():\r
                        self.cam = webcam.webcam()\r
+                       if not self.cam.hasCamera():\r
+                               self.cam = None\r
 \r
                #self.SetIcon(icon.getMainIcon())\r
                \r
@@ -245,7 +247,7 @@ class printWindow(wx.Frame):
 \r
                nb.AddPage(self.termPanel, 'Term')\r
                \r
-               if self.cam != None and self.cam.hasCamera():\r
+               if self.cam != None:\r
                        self.camPage = wx.Panel(nb)\r
                        sizer = wx.GridBagSizer(2, 2)\r
                        self.camPage.SetSizer(sizer)\r
@@ -343,7 +345,7 @@ class printWindow(wx.Frame):
                self.bedTemperatureSelect.Enable(self.machineCom != None and self.machineCom.isOperational())\r
                self.directControlPanel.Enable(self.machineCom != None and self.machineCom.isOperational() and not self.machineCom.isPrinting())\r
                self.machineLogButton.Show(self.machineCom != None and self.machineCom.isClosedOrError())\r
-               if self.cam:\r
+               if self.cam != None:\r
                        for button in self.cam.buttons:\r
                                button.Enable(self.machineCom == None or not self.machineCom.isPrinting())\r
        \r