From: daid303 <daid303@gmail.com>
Date: Mon, 1 Oct 2012 12:54:00 +0000 (+0200)
Subject: Always check for OpenCV first, in case we have both OpenCV and win32vidcapture
X-Git-Tag: 13.03~308
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=22cf43e873b85fccad514fc315582db1550a01d0;p=cura.git

Always check for OpenCV first, in case we have both OpenCV and win32vidcapture
---

diff --git a/Cura/gui/webcam.py b/Cura/gui/webcam.py
index e511c180..1f309983 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: