Cosmetic fixes to the Web Control #468
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
August 17, 2017 00:22
The camera count was using the thread count, which is wrong if we have more than one thread (in most cases).
When running multiple cameras or a single camera with the config `camera` lines, motion creates a thread for each camera (even if just the one). A mis-configuration can easily happen where the `stream_port` option remains set in `motion.conf`. This causes the Web control preview section to show a duplicate of one stream. Prevent this by knowing that if we are multi-threaded, the main thread has no active camera and don't loop over it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This covers one issue from #442, Web Control showing the wrong count of cameras.
Currently it just shows the count of cameras as the count of threads, which is only correct when running one camera with a single
motion.conffile. Once you have a separatecamera1.confand so on, the thread count will always be one higher than the camera count.In a similar manner, the stream preview section can duplicate a preview when motion is mis-configured with multiple cameras. If you leave
stream_portenabled inmotion.confand use the same port in one of the camera files, it will show that preview twice.The fixes for both are quite non-invasive and provide a cosmetic improvement.