combined criteria

QnetGateway.cpp

@@ -1000,9 +1000,8 @@ void CQnetGateway::ProcessG2(const ssize_t g2buflen, const SDSVT &g2buf, const b
 		if (g2buflen == 56) {
 			// Find out the local repeater module IP/port to send the data to
 			int i = g2buf.hdr.rpt1[7] - 'A';
-			if (rptr.mod[i].defined) {
 			/* valid repeater module? */
-				if (i>=0 && i<3) {
+			if (i>=0 && i<3 && rptr.mod[i].defined) {
 				// toRptr[i] is active if a remote system is talking to it or
 				// toRptr[i] is receiving data from a cross-band
 				if (0==toRptr[i].last_time && 0==band_txt[i].last_time && (Flag_is_ok(g2buf.hdr.flag[0]) || 0x01U==g2buf.hdr.flag[0] || 0x40U==g2buf.hdr.flag[0])) {
@@ -1052,7 +1051,6 @@ void CQnetGateway::ProcessG2(const ssize_t g2buflen, const SDSVT &g2buf, const b
 					toRptr[i].sequence = rptrbuf.vpkt.ctrl;
 				}
 			}
-			}
 		} else {	// g2buflen == 27
 			/* find out which repeater module to send the data to */
 			int i;