Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

backend: fix crash in SubscribeCameraStatus #527

Merged
merged 3 commits into from
Sep 2, 2018
Merged

backend: fix crash in SubscribeCameraStatus #527

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
100b721
backend: fix crash in SubscribeCameraStatus
JonasVautherin Sep 1, 2018
862d318
backend: fix style
julianoes Sep 1, 2018
1f4f075
backend: mutex doesn't need to be mutable
julianoes Sep 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion backend/src/plugins/camera/camera_service_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,12 +459,13 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service {

bool is_finished = false;

_camera.subscribe_status([&writer, &stream_closed_promise, &is_finished](
_camera.subscribe_status([this, &writer, &stream_closed_promise, &is_finished](
const dronecode_sdk::Camera::Status camera_status) {
rpc::camera::CameraStatusResponse rpc_camera_status_response;
auto rpc_camera_status = translateCameraStatus(camera_status);
rpc_camera_status_response.set_allocated_camera_status(rpc_camera_status.release());

std::lock_guard<std::mutex> lock(_subscribe_camera_status_mutex);
if (!writer->Write(rpc_camera_status_response) && !is_finished) {
is_finished = true;
stream_closed_promise.set_value();
Expand Down Expand Up @@ -704,6 +705,7 @@ class CameraServiceImpl final : public rpc::camera::CameraService::Service {

private:
Camera &_camera;
std::mutex _subscribe_camera_status_mutex{};
};

} // namespace backend
Expand Down