From 6505494b93c69394e2b8c05fb51ca3988230ed55 Mon Sep 17 00:00:00 2001 From: john30 Date: Sun, 2 Jul 2017 10:30:52 +0200 Subject: [PATCH] corrected unique JSON keys in executeGet() --- src/ebusd/mainloop.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ebusd/mainloop.cpp b/src/ebusd/mainloop.cpp index 7efdc100..560e9288 100644 --- a/src/ebusd/mainloop.cpp +++ b/src/ebusd/mainloop.cpp @@ -1754,9 +1754,9 @@ result_t MainLoop::executeGet(const vector& args, bool* connected, ostri } name = message->getName(); bool same = sameCircuit && name == lastName; - if (!same && sameCircuit && it+1 != messages.end()) { + if (!same && it+1 != messages.end()) { Message* next = *(it+1); - same = next->getName() == name; + same = next->getCircuit() == lastCircuit && next->getName() == name; } message->decodeJson(!first, same, raw, verbosity, ostream); lastName = name;