From 22cf43e873b85fccad514fc315582db1550a01d0 Mon Sep 17 00:00:00 2001 From: daid303 Date: Mon, 1 Oct 2012 14:54:00 +0200 Subject: [PATCH] Always check for OpenCV first, in case we have both OpenCV and win32vidcapture --- Cura/gui/webcam.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Cura/gui/webcam.py b/Cura/gui/webcam.py index e511c18..1f30998 100644 --- a/Cura/gui/webcam.py +++ b/Cura/gui/webcam.py @@ -50,16 +50,18 @@ class webcam(object): def propertyPages(self): if self._cam == None: return [] - if win32vidcap != None: - return ['Image properties', 'Format properties'] if cv != None: #TODO Make an OpenCV property page return [] + elif win32vidcap != None: + return ['Image properties', 'Format properties'] def openPropertyPage(self, pageType = 0): if self._cam == None: return - if win32vidcap != None: + if cv != None: + pass + elif win32vidcap != None: if pageType == 0: self._cam.displaycapturefilterproperties() else: