mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-09-05 14:47:54 -04:00
Don't allow n3 > Nslots.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8617 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
25fce25220
commit
62b8b6531e
@ -7550,7 +7550,6 @@ void MainWindow::foxTxSequencer()
|
|||||||
foxGenWaveform(islot-1,fm);
|
foxGenWaveform(islot-1,fm);
|
||||||
goto Transmit;
|
goto Transmit;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Compile list1:
|
//Compile list1:
|
||||||
for(QString hc: m_foxQSO.keys()) { //Check all Hound calls: First priority
|
for(QString hc: m_foxQSO.keys()) { //Check all Hound calls: First priority
|
||||||
if(m_foxQSO[hc].tFoxRrpt<0) continue;
|
if(m_foxQSO[hc].tFoxRrpt<0) continue;
|
||||||
@ -7626,6 +7625,7 @@ list2Done:
|
|||||||
n1=list1.size();
|
n1=list1.size();
|
||||||
n2=list2.size();
|
n2=list2.size();
|
||||||
n3=qMax(n1,n2);
|
n3=qMax(n1,n2);
|
||||||
|
if(n3>m_Nslots) n3=m_Nslots;
|
||||||
for(int i=0; i<n3; i++) {
|
for(int i=0; i<n3; i++) {
|
||||||
hc1="";
|
hc1="";
|
||||||
fm="";
|
fm="";
|
||||||
@ -7667,7 +7667,7 @@ list2Done:
|
|||||||
foxGenWaveform(islot-1,fm); //Generate tx waveform
|
foxGenWaveform(islot-1,fm); //Generate tx waveform
|
||||||
}
|
}
|
||||||
|
|
||||||
if(n3 < m_Nslots) {
|
if(islot < m_Nslots) {
|
||||||
//At least one slot is still open, so we'll add one CQ message
|
//At least one slot is still open, so we'll add one CQ message
|
||||||
fm=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign();
|
fm=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign();
|
||||||
if(!fm.contains("/")) {
|
if(!fm.contains("/")) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user