Skip to content

Commit

Permalink
changing is_initialized to ok() for released version to work
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Lautman authored and Mike Lautman committed Dec 12, 2018
1 parent bbc5986 commit 73874e5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions rqt_gui_cpp/src/rqt_gui_cpp/roscpp_plugin_provider.cpp
Expand Up @@ -49,7 +49,7 @@ RosCppPluginProvider::RosCppPluginProvider()
: qt_gui_cpp::CompositePluginProvider()
, rclcpp_initialized_(false)
{
if (rclcpp::is_initialized(rclcpp::contexts::default_context::get_global_default_context()))
if (rclcpp::ok(rclcpp::contexts::default_context::get_global_default_context()))
{
rclcpp_initialized_ = true;
}
Expand All @@ -62,7 +62,7 @@ RosCppPluginProvider::RosCppPluginProvider()

RosCppPluginProvider::~RosCppPluginProvider()
{
if (rclcpp::is_initialized(rclcpp::contexts::default_context::get_global_default_context()))
if (rclcpp::ok(rclcpp::contexts::default_context::get_global_default_context()))
{
rclcpp::shutdown();
}
Expand Down

2 comments on commit 73874e5

@dirk-thomas
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the status of this branch?

@mlautman
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No longer needed as a result of ros2/rclcpp#587

Please sign in to comment.