Merge branch 'hotfix/NoHoundTxEven'

Don't allow Hound to Tx even; don't allow Fox to Tx odd.
This commit is contained in:
Joe Taylor 2018-07-02 10:41:45 -04:00
commit 3082454628

View File

@ -913,15 +913,15 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
MessageBox::critical_message (this,
"Code in the WSJT-X development branch is\n"
"not currently available for on-the-air use.\n\n"
"Please use WSJT-X v1.8.0\n", errorMsg);
"Please use WSJT-X v1.9.1\n", errorMsg);
Q_EMIT finished ();
}
*/
if(QCoreApplication::applicationVersion().contains("-devel") or
QCoreApplication::applicationVersion().contains("-rc")) {
QTimer::singleShot (0, this, SLOT (not_GA_warning_message ()));
}
*/
if(!ui->cbMenus->isChecked()) {
ui->cbMenus->setChecked(true);
ui->cbMenus->setChecked(false);
@ -4108,6 +4108,8 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
int nmod = message.timeInSeconds () % (2*m_TRperiod);
m_txFirst=(nmod!=0);
if(m_config.bHound()) m_txFirst=false; //Hound must not transmit first
if(m_config.bFox()) m_txFirst=true; //Fox must always transmit first
ui->txFirstCheckBox->setChecked(m_txFirst);
auto const& message_words = message.messageWords ();