Skip to content
Snippets Groups Projects
Commit 842d5bbc authored by Fabian Reister's avatar Fabian Reister
Browse files

component plugin: ignoring if configureNavigator has already been called once

parent f6643d65
No related branches found
No related tags found
No related merge requests found
...@@ -57,7 +57,7 @@ armarx::navigation::client::ComponentPlugin::configureNavigator( ...@@ -57,7 +57,7 @@ armarx::navigation::client::ComponentPlugin::configureNavigator(
{ {
ARMARX_TRACE; ARMARX_TRACE;
ARMARX_CHECK_NULL(eventHandler) << "`configureNavigator()` can only be called once!"; // ARMARX_CHECK_NULL(eventHandler) << "`configureNavigator()` can only be called once!";
eventHandler = [&]() -> std::unique_ptr<SimpleEventHandler> eventHandler = [&]() -> std::unique_ptr<SimpleEventHandler>
{ {
...@@ -88,9 +88,7 @@ armarx::navigation::client::ComponentPlugin::configureNavigator( ...@@ -88,9 +88,7 @@ armarx::navigation::client::ComponentPlugin::configureNavigator(
{ {
ARMARX_TRACE; ARMARX_TRACE;
ARMARX_CHECK_NULL(eventHandler) << "`configureNavigator()` can only be called once!"; // ARMARX_CHECK_NULL(eventHandler) << "`configureNavigator()` can only be called once!";
eventHandler = std::make_unique<MemorySubscriber>(configId, memoryNameSystem);
iceNavigator.createConfig(stackConfig, configId); iceNavigator.createConfig(stackConfig, configId);
......
...@@ -63,13 +63,12 @@ namespace armarx::navigation::client ...@@ -63,13 +63,12 @@ namespace armarx::navigation::client
void configureNavigator(const client::NavigationStackConfig& stackConfig); void configureNavigator(const client::NavigationStackConfig& stackConfig);
Navigator& getNavigator(); Navigator& getNavigator();
// Non-API // Non-API
~ComponentPluginUser() override; ~ComponentPluginUser() override;
private: private:
ComponentPlugin* plugin = nullptr; ComponentPlugin* plugin = nullptr;
}; };
} // namespace armarx::navigation::client } // namespace armarx::navigation::client
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment