ros-naoqi#58 is not compatible with previous version...

kochigami · Jan 9, 2018 · b31735b · b31735b
1 parent e44a81a
commit b31735b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/ros_env.hpp b/src/ros_env.hpp
@@ -89,7 +89,8 @@ static void setMasterURI( const std::string& uri, const std::string& network_int
   remap["__master"] = uri;
   remap["__ip"] = ::naoqi::ros_env::getROSIP(network_interface);
   // init ros without a sigint-handler in order to shutdown correctly by naoqi
-  ros::init( remap, ::naoqi::ros_env::getPrefix().empty()?std::string("naoqi_driver_node"):(::naoqi::ros_env::getPrefix()) , ros::init_options::NoSigintHandler );
+  const char* ns_env = std::getenv("ROS_NAMESPACE");
+  ros::init( remap, (ns_env==NULL)?(std::string("naoqi_driver_node")):(::naoqi::ros_env::getPrefix()) , ros::init_options::NoSigintHandler );
   // to prevent shutdown based on no existing nodehandle
   ros::start();