chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed macro expansion for auto-reply messages QTC and QTH

Browse Source
This commit is contained in:
Jordan Sherer 2018-11-03 22:20:49 -04:00
parent d5e1f2822d
commit 0a6ec136f9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mainwindow.cpp
View File

@ -1448,7 +1448,7 @@ void MainWindow::initializeDummyData(){
auto d = DecodedText("h+vWp6mRPprH", 6); auto d = DecodedText("h+vWp6mRPprH", 6);
qDebug() << d.message() << buildMessageFrames(d.message()); qDebug() << d.message() << buildMessageFrames(d.message());
auto d = DecodedText("bYG4CKYT0cKG", 7); d = DecodedText("bYG4CKYT0cKG", 7);
qDebug() << d.message(); qDebug() << d.message();
// qDebug() << Varicode::isValidCallsign("@GROUP1", nullptr); // qDebug() << Varicode::isValidCallsign("@GROUP1", nullptr);
@ -8747,7 +8747,7 @@ void MainWindow::processCommandActivity() {
continue; continue;
} }
reply = QString("%1 QTH %2").arg(d.from).arg(qth); reply = QString("%1 QTH %2").arg(d.from).arg(replaceMacros(qth, buildMacroValues(), true));
} }
// QUERIED ACTIVE // QUERIED ACTIVE
@ -8771,7 +8771,11 @@ void MainWindow::processCommandActivity() {
// QUERIED STATION MESSAGE // QUERIED STATION MESSAGE
else if (d.cmd == " QTC?" && !isAllCall) { else if (d.cmd == " QTC?" && !isAllCall) {
reply = QString("%1 QTC %2").arg(d.from).arg(m_config.my_station()); QString qtc = m_config.my_station();
if(qtc.isEmpty()) {
continue;
}
reply = QString("%1 QTC %2").arg(d.from).arg(replaceMacros(qtc, buildMacroValues(), true));
} }
#if ALLOW_STATIONS_HEARD #if ALLOW_STATIONS_HEARD