do not register own master address during send

2017-04-17 19:27:52 +02:00
parent 47ed6dde3f
commit b77e0d092c
1 changed files with 4 additions and 2 deletions
@@ -277,7 +277,7 @@ bool GrabbedMessage::dump(const bool unknown, MessageMap* messages, bool first,
    if (!types) {
      return true;
    }
-    bool master = isMaster(dstAddress) || dstAddress == BROADCAST || m_lastSlave.size() <= 1 || m_lastSlave[0] == 0;
+    bool master = isMaster(dstAddress) || dstAddress == BROADCAST || m_lastSlave.getDataSize() <= 0;
    SymbolString *input;
    if (master) {
      input = &m_lastMaster;
@@ -1030,7 +1030,9 @@ void BusHandler::receiveCompleted() {
    logError(lf_bus, "invalid self-addressed message from %2.2x", srcAddress);
    return;
  }
-  addSeenAddress(srcAddress);
+  if (!m_currentRequest) {
+    addSeenAddress(srcAddress);
+  }
  addSeenAddress(dstAddress);

  bool master = isMaster(dstAddress);