Skip to content

Commit

Permalink
Merge pull request #37 from Boltgolt/dev
Browse files Browse the repository at this point in the history
Version 2.2.2
  • Loading branch information
boltgolt authored May 11, 2018
2 parents 4ec9dc3 + 5e72907 commit 961342a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
howdy (2.2.2) xenial; urgency=medium

* Fixed fetching of wrong config section (thanks @halcyoncheng and @arifeinberg!)

-- boltgolt <[email protected]> Fri, 11 May 2018 10:43:03 +0200

howdy (2.2.1) xenial; urgency=medium

* Added mechanism to keep config files between updates
Expand Down
2 changes: 1 addition & 1 deletion src/cli/add.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
video_capture = cv2.VideoCapture(int(config.get("video", "device_id")))

# Force MJPEG decoding if true
if config.get("debug", "force_mjpeg") == "true":
if config.get("video", "force_mjpeg") == "true":
video_capture.set(cv2.CAP_PROP_FOURCC, 1196444237)

# Request a frame to wake the camera up
Expand Down
2 changes: 1 addition & 1 deletion src/cli/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
video_capture = cv2.VideoCapture(int(config.get("video", "device_id")))

# Force MJPEG decoding if true
if config.get("debug", "force_mjpeg") == "true":
if config.get("video", "force_mjpeg") == "true":
video_capture.set(cv2.CAP_PROP_FOURCC, 1196444237)

# Let the user know what's up
Expand Down

0 comments on commit 961342a

Please sign in to comment.