From 93cfb4abda3f9aefb6ba482a8533f95ae2485643 Mon Sep 17 00:00:00 2001
From: john30 <ebusd@ebusd.eu>
Date: Sat, 19 Nov 2016 12:16:51 +0100
Subject: [PATCH] fix for ChainedMessage::checkId

---
 src/lib/ebus/message.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/ebus/message.cpp b/src/lib/ebus/message.cpp
index 110a8265..f0bc3953 100644
--- a/src/lib/ebus/message.cpp
+++ b/src/lib/ebus/message.cpp
@@ -838,14 +838,14 @@ bool ChainedMessage::checkId(Message& other)
 		return false; // chain prefix mismatch
 	}
 	vector< vector<unsigned char> > otherIds = ((ChainedMessage&)other).m_ids;
-	unsigned char chainPrefixLength = (unsigned char)m_id.size();
+	unsigned char chainPrefixLength = Message::getIdLength();
 	for (unsigned char checkIndex=0; checkIndex<m_ids.size(); checkIndex++) { // check suffix for each part
 		vector<unsigned char> id = m_ids[checkIndex];
 		for (unsigned char otherIndex=0; otherIndex<otherIds.size(); otherIndex++) {
 			vector<unsigned char> otherId = otherIds[otherIndex];
 			bool found = false;
 			for (unsigned char pos=chainPrefixLength; pos<idLen; pos++) {
-				if (id[pos] != otherId[pos]) {
+				if (id[2+pos] != otherId[2+pos]) {
 					found = false;
 					break;
 				}