[v1.4] Fix conflict in camera subscriptions #2133
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
JonasVautherin
commented
Sep 8, 2023
| @@ -222,6 +225,7 @@ void CameraImpl::manual_disable() | |||
| { | |||
| invalidate_params(); | |||
| _parent->remove_call_every(_camera_information_call_every_cookie); | |||
| // TODO: should this remove_call_every for _status.call_every_cookie? | |||
There was a problem hiding this comment.
@julianoes: not sure about what manual_disable() does... should it remove_call_every(_status.call_every_cookie) here?
There was a problem hiding this comment.
It's used when you select another camera. Not sure, I'd probably add it for consistency.
There was a problem hiding this comment.
Up to you, otherwise this is fine.
There was a problem hiding this comment.
Oh right, it should otherwise it will leak a callback when manual_enable() is called again 🤔. I'll change that!
JonasVautherin
force-pushed
the
1.4-fix-camera-subscription-conflict
branch
from
e286c36 to
28e3de5
Compare
JonasVautherin
force-pushed
the
1.4-fix-camera-subscription-conflict
branch
from
28e3de5 to
9740dde
Compare
julianoes
approved these changes
Sep 13, 2023
julianoes
changed the title
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.
The fact that
_status.call_every_cookieis shared between two subscriptions (camera status and camera information) makes them conflict: when unsubscribing from one, it cancels the call_every for both.Also, depending on the order, it will
add_call_everytwice with the same cookie, which I believe ends up leaking one.This PR makes it simpler by requesting the status updates in the plugin directly. I don't think it is worth trying to optimize the number of requests here (and I am pretty sure it ended up doubling them in SiteScan).