Fixed merge conflicts and simplified new capture creation

2019-04-26 18:32:32 +01:00 · 2019-04-26 18:32:32 +01:00 · fface9994e
commit fface9994e
parent ea44bbefd2 537e01c6da
7 changed files with 49 additions and 26 deletions
--- a/openflexure_microscope/camera/base.py
+++ b/openflexure_microscope/camera/base.py
@ -345,7 +345,7 @@ class BaseCamera(object):
            write_to_file: bool = True,
            temporary: bool = False,
            filename: str = None,
-            folder: str = None,
+            folder: str = "",
            fmt: str = 'h264'):

        """