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

Plugins: don't remove pending timeouts on disconnect #666

Merged
merged 2 commits into from
Feb 12, 2019
Merged

Plugins: don't remove pending timeouts on disconnect #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5544c3d
mission: unregister only on destruction
julianoes Feb 12, 2019
a09fd79
telemetry: unregister timeouts on destruction only
julianoes Feb 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions plugins/mission/mission_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,11 @@ void MissionImpl::init()

void MissionImpl::enable() {}

void MissionImpl::disable()
{
_parent->unregister_timeout_handler(_timeout_cookie);
}
void MissionImpl::disable() {}

void MissionImpl::deinit()
{
_parent->unregister_timeout_handler(_timeout_cookie);
_parent->unregister_all_mavlink_message_handlers(this);
}

Expand Down
6 changes: 2 additions & 4 deletions plugins/telemetry/telemetry_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ void TelemetryImpl::init()

void TelemetryImpl::deinit()
{
_parent->unregister_timeout_handler(_timeout_cookie);
_parent->unregister_param_changed_handler(this);
_parent->unregister_all_mavlink_message_handlers(this);
}
Expand Down Expand Up @@ -118,10 +119,7 @@ void TelemetryImpl::enable()
std::placeholders::_2));
}

void TelemetryImpl::disable()
{
_parent->unregister_timeout_handler(_timeout_cookie);
}
void TelemetryImpl::disable() {}

Telemetry::Result TelemetryImpl::set_rate_position_velocity_ned(double rate_hz)
{
Expand Down