From 84c6e96c9d5179825d4e3f2e88bd2c40ff0f37b4 Mon Sep 17 00:00:00 2001
From: Qais Patankar <qaisjp@gmail.com>
Date: Wed, 19 Jun 2019 13:59:21 +0100
Subject: [PATCH] router: minor handleReceive tweak

---
 gateway/router.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gateway/router.go b/gateway/router.go
index 62b1bf03..84fd8d1a 100644
--- a/gateway/router.go
+++ b/gateway/router.go
@@ -125,7 +125,8 @@ func (r *Router) handleReceive() {
 		r.handleEventGetChannelMembers(&msg)
 		r.handleEventFailure(&msg)
 		r.handleEventRejoinChannels(&msg)
-		idx := 0
+
+		filesHandled := false
 		for _, gw := range r.Gateways {
 			// record all the message ID's of the different bridges
 			var msgIDs []*BrMsgID
@@ -134,8 +135,9 @@ func (r *Router) handleReceive() {
 			}
 			msg.Timestamp = time.Now()
 			gw.modifyMessage(&msg)
-			if idx == 0 {
+			if !filesHandled {
 				gw.handleFiles(&msg)
+				filesHandled = true
 			}
 			for _, br := range gw.Bridges {
 				msgIDs = append(msgIDs, gw.handleMessage(&msg, br)...)
@@ -144,8 +146,6 @@ func (r *Router) handleReceive() {
 			// Always add/update the message ID. This is necessary as msgIDs
 			// will change if a bridge returns a different ID in response to edits.
 			gw.Messages.Add(msg.Protocol+" "+msg.ID, msgIDs)
-
-			idx++
 		}
 	}
 }