From 6199c115051f9e8720e4610bddc203f5c66651a6 Mon Sep 17 00:00:00 2001
From: Veloman Yunkan <veloman.yunkan@gmail.com>
Date: Sun, 21 Nov 2021 19:58:20 +0400
Subject: [PATCH] NameMapperProxy respects the withAlias flag

---
 include/name_mapper.h | 3 ++-
 src/name_mapper.cpp   | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/name_mapper.h b/include/name_mapper.h
index e7770865b..cba4bbdc8 100644
--- a/include/name_mapper.h
+++ b/include/name_mapper.h
@@ -59,7 +59,7 @@ class HumanReadableNameMapper : public NameMapper {
 class NameMapperProxy : public NameMapper {
     typedef std::shared_ptr<NameMapper> NameMapperHandle;
   public:
-    explicit NameMapperProxy(Library& library);
+    NameMapperProxy(Library& library, bool withAlias);
 
     virtual std::string getNameForId(const std::string& id) const;
     virtual std::string getIdForName(const std::string& name) const;
@@ -73,6 +73,7 @@ class NameMapperProxy : public NameMapper {
     mutable std::mutex mutex;
     Library& library;
     NameMapperHandle nameMapper;
+    const bool withAlias;
 };
 
 }
diff --git a/src/name_mapper.cpp b/src/name_mapper.cpp
index b7ec24493..eb82e873d 100644
--- a/src/name_mapper.cpp
+++ b/src/name_mapper.cpp
@@ -63,15 +63,16 @@ std::string HumanReadableNameMapper::getIdForName(const std::string& name) const
 // NameMapperProxy
 ////////////////////////////////////////////////////////////////////////////////
 
-NameMapperProxy::NameMapperProxy(Library& lib)
+NameMapperProxy::NameMapperProxy(Library& lib, bool withAlias)
   : library(lib)
+  , withAlias(withAlias)
 {
   update();
 }
 
 void NameMapperProxy::update()
 {
-  const auto newNameMapper = new HumanReadableNameMapper(library, false);
+  const auto newNameMapper = new HumanReadableNameMapper(library, withAlias);
   std::lock_guard<std::mutex> lock(mutex);
   nameMapper.reset(newNameMapper);
 }