Simplifying code

YSFGateway/YSFGateway.cpp

@@ -268,8 +268,7 @@ int CYSFGateway::run()
 				unsigned char ft = fich.getFT();
 
 				CYSFReflector* reflector = m_wiresX->getReflector();
-				if (m_ysfNetwork != NULL && m_linkType == LINK_YSF && wiresXCommandPassthrough) {
+				if (m_ysfNetwork != NULL && m_linkType == LINK_YSF && wiresXCommandPassthrough && reflector->m_wiresX) {
-					if (reflector->m_wiresX) {
 					processDTMF(buffer, dt);
 					processWiresX(buffer, fi, dt, fn, ft, true, wiresXCommandPassthrough);
 				} else {
@@ -277,15 +276,6 @@ int CYSFGateway::run()
 					processDTMF(buffer, dt);
 					processWiresX(buffer, fi, dt, fn, ft, false, wiresXCommandPassthrough);
 				}
-				} else if (wiresXCommandPassthrough) {
-					m_exclude = (dt == YSF_DT_DATA_FR_MODE);
-					processDTMF(buffer, dt);
-					processWiresX(buffer, fi, dt, fn, ft, false, wiresXCommandPassthrough);
-				} else {
-					m_exclude = (dt == YSF_DT_DATA_FR_MODE);
-					processDTMF(buffer, dt);
-					processWiresX(buffer, fi, dt, fn, ft, false, wiresXCommandPassthrough);
-				}
 
 				if (m_gps != NULL)
 					m_gps->data(buffer + 14U, buffer + 35U, fi, dt, fn, ft);