Update YSFGateway.cpp

This is not exactly elegant, its not a state issue exactly, just cant read reflector->m_wiresX when there is no reflector...
This commit is contained in:
Andy Taylor 2019-01-29 17:05:46 +00:00 committed by GitHub
parent 7fc0fc7db7
commit 8288d64848
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -268,13 +268,22 @@ int CYSFGateway::run()
unsigned char ft = fich.getFT();
CYSFReflector* reflector = m_wiresX->getReflector();
if ( (wiresXCommandPassthrough) && (reflector->m_wiresX) ) {
// Allow WiresX to Pass Through
processDTMF(buffer, dt);
processWiresX(buffer, fi, dt, fn, ft, true);
if ( (wiresXCommandPassthrough) && (reflector) ) {
// Connected to a reflector, figure out what kind it is
if (reflector->m_wiresX) {
// Pass Control Commands (WiresX capable reflector)
processDTMF(buffer, dt);
processWiresX(buffer, fi, dt, fn, ft, true);
}
else {
// Don't Pass Control Commands (Not a WiresX capable reflector)
m_exclude = (dt == YSF_DT_DATA_FR_MODE);
processDTMF(buffer, dt);
processWiresX(buffer, fi, dt, fn, ft, false);
}
}
else {
// Don't Pass Control Commands
// Don't Pass Control Commands (Not connected to a reflector)
m_exclude = (dt == YSF_DT_DATA_FR_MODE);
processDTMF(buffer, dt);
processWiresX(buffer, fi, dt, fn, ft, false);