From 7961eab97e4274e7d279e274935a97ffc64a3de5 Mon Sep 17 00:00:00 2001
From: bmcpt <iaansagar@gmail.com>
Date: Thu, 18 Aug 2022 01:47:30 +0530
Subject: [PATCH] group multiplexer values by message id as well

---
 src/libdbcppp/DBCAST2Network.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libdbcppp/DBCAST2Network.cpp b/src/libdbcppp/DBCAST2Network.cpp
index 8a06ec56..fbbf155c 100644
--- a/src/libdbcppp/DBCAST2Network.cpp
+++ b/src/libdbcppp/DBCAST2Network.cpp
@@ -231,12 +231,12 @@ static auto getSignalExtendedValueType(const G_Network& gnet, const G_Message& m
     }
     return extended_value_type;
 }
-static auto getSignalMultiplexerValues(const G_Network& gnet, const G_Signal& s)
+static auto getSignalMultiplexerValues(const G_Network& gnet, const std::string& s, const uint64_t m)
 {
     std::vector<std::unique_ptr<ISignalMultiplexerValue>> signal_multiplexer_values;
     for (const auto& gsmv : gnet.signal_multiplexer_values)
     {
-        if (gsmv.signal_name == s.name)
+        if (gsmv.signal_name == s && gsmv.message_id == m)
         {
             auto switch_name = gsmv.switch_name;
             std::vector<ISignalMultiplexerValue::Range> value_ranges;
@@ -263,7 +263,7 @@ static auto getSignals(const G_Network& gnet, const G_Message& m)
         auto extended_value_type = getSignalExtendedValueType(gnet, m, s);
         auto multiplexer_indicator = ISignal::EMultiplexer::NoMux;
         auto comment = getComment(gnet, m, s);
-        auto signal_multiplexer_values = getSignalMultiplexerValues(gnet, s);
+        auto signal_multiplexer_values = getSignalMultiplexerValues(gnet, s.name, m.id);
         uint64_t multiplexer_switch_value = 0;
         if (s.multiplexer_indicator)
         {