Fixed issue with tx queue when idle watchdog kicks in

This commit is contained in:
Jordan Sherer 2019-01-20 11:02:10 -05:00
parent 239b02d927
commit d722b8206c
3 changed files with 1016 additions and 5 deletions

View File

@ -5694,10 +5694,6 @@ void MainWindow::enqueueMessage(int priority, QString message, int freq, Callbac
); );
} }
void MainWindow::enqueueHeartbeat(QString message){
m_txHeartbeatQueue.enqueue(message);
}
void MainWindow::resetMessage(){ void MainWindow::resetMessage(){
resetMessageUI(); resetMessageUI();
resetMessageTransmitQueue(); resetMessageTransmitQueue();
@ -11446,6 +11442,9 @@ void MainWindow::tx_watchdog (bool triggered)
MessageBox::warning_message(this, QString("You have been inactive for more than %1 minutes.").arg(m_config.watchdog())); MessageBox::warning_message(this, QString("You have been inactive for more than %1 minutes.").arg(m_config.watchdog()));
// clear the tx queues
resetMessageTransmitQueue();
// restore the button states // restore the button states
ui->autoReplyButton->setChecked(wasAuto); ui->autoReplyButton->setChecked(wasAuto);
ui->hbMacroButton->setChecked(wasHB); ui->hbMacroButton->setChecked(wasHB);

View File

@ -149,7 +149,6 @@ public slots:
void prependMessageText(QString text); void prependMessageText(QString text);
void addMessageText(QString text, bool clear=false, bool selectFirstPlaceholder=false); void addMessageText(QString text, bool clear=false, bool selectFirstPlaceholder=false);
void enqueueMessage(int priority, QString message, int freq, Callback c); void enqueueMessage(int priority, QString message, int freq, Callback c);
void enqueueHeartbeat(QString message);
void resetMessage(); void resetMessage();
void resetMessageUI(); void resetMessageUI();
void restoreMessage(); void restoreMessage();

1013
mainwindow.h.autosave Normal file

File diff suppressed because it is too large Load Diff