From 7961d63d548e201b21c71e6f869ba857738d8d6c Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Thu, 18 Aug 2022 22:56:46 +0200
Subject: [PATCH] navigator: remotegui as optional
---
source/armarx/navigation/components/navigator/Component.cpp | 2 +-
source/armarx/navigation/components/navigator/Component.h | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/source/armarx/navigation/components/navigator/Component.cpp b/source/armarx/navigation/components/navigator/Component.cpp
index e8612e91..b5dff818 100644
--- a/source/armarx/navigation/components/navigator/Component.cpp
+++ b/source/armarx/navigation/components/navigator/Component.cpp
@@ -191,7 +191,7 @@ namespace armarx::navigation::components::navigator
// memoryIntrospector = server::MemoryIntrospector(resultsWriterPlugin->get(), );
- navRemoteGui = std::make_unique<navigator::RemoteGui>(remoteGui, *this);
+ navRemoteGui.emplace(remoteGui, *this);
navRemoteGui->enable();
initialized = true;
diff --git a/source/armarx/navigation/components/navigator/Component.h b/source/armarx/navigation/components/navigator/Component.h
index 7462c3d7..316e4da5 100644
--- a/source/armarx/navigation/components/navigator/Component.h
+++ b/source/armarx/navigation/components/navigator/Component.h
@@ -176,9 +176,7 @@ namespace armarx::navigation::components::navigator
std::mutex propertiesMutex;
- // TODO maybe as optional, but requires some effort
- std::unique_ptr<armarx::navigation::components::navigator::RemoteGui> navRemoteGui;
-
+ std::optional<armarx::navigation::components::navigator::RemoteGui> navRemoteGui;
// unique_ptr to avoid dangling refs
std::vector<std::unique_ptr<server::MemoryIntrospector>> memoryIntrospectors;
--
GitLab