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 e511c18045f9fd89b45b58d9bfb1d15a138e954f..1f3099838694fa7168e02533cb96e9a980a06dc7 100644 (file)
--- a/Cura/gui/webcam.py
+++ b/Cura/gui/webcam.py
@@ -50,16 +50,18 @@ class webcam(object):
        def propertyPages(self):\r
                if self._cam == None:\r
                        return []\r
-               if win32vidcap != None:\r
-                       return ['Image properties', 'Format properties']\r
                if cv != None:\r
                        #TODO Make an OpenCV property page\r
                        return []\r
+               elif win32vidcap != None:\r
+                       return ['Image properties', 'Format properties']\r
 \r
        def openPropertyPage(self, pageType = 0):\r
                if self._cam == None:\r
                        return\r
-               if win32vidcap != None:\r
+               if cv != None:\r
+                       pass\r
+               elif win32vidcap != None:\r
                        if pageType == 0:\r
                                self._cam.displaycapturefilterproperties()\r
                        else:\r