mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-25 21:58:38 -05:00
Merge branch 'hotfix-2.0.0-rc3' of bitbucket.org:k1jt/wsjtx into hotfix-2.0.0-rc3
This commit is contained in:
commit
f5a7c52c8b
@ -207,6 +207,9 @@ QByteArray ADIF::QSOToADIF(QString const& hisCall, QString const& hisGrid, QStri
|
|||||||
if(operator_call!="") t+=" <operator:" + QString::number(operator_call.length()) + ">" + operator_call;
|
if(operator_call!="") t+=" <operator:" + QString::number(operator_call.length()) + ">" + operator_call;
|
||||||
if(xSent!="") t += " <STX_STRING:" + QString::number(xSent.length()) + ">" + xSent;
|
if(xSent!="") t += " <STX_STRING:" + QString::number(xSent.length()) + ">" + xSent;
|
||||||
if(xRcvd!="") t += " <SRX_STRING:" + QString::number(xRcvd.length()) + ">" + xRcvd;
|
if(xRcvd!="") t += " <SRX_STRING:" + QString::number(xRcvd.length()) + ">" + xRcvd;
|
||||||
|
QString t1=xRcvd.split(" ").at(1);
|
||||||
|
qDebug() << "aa0" << xRcvd << t1;
|
||||||
|
if(xRcvd!="") t += " <STATE:" + QString::number(t1.length()) + ">" + t1;
|
||||||
return t.toLatin1();
|
return t.toLatin1();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3574,7 +3574,6 @@ void MainWindow::guiUpdate()
|
|||||||
m_xSent=t.at(n-2) + " " + t.at(n-1);
|
m_xSent=t.at(n-2) + " " + t.at(n-1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
if(m_isync==1) msgsent[22]=0;
|
if(m_isync==1) msgsent[22]=0;
|
||||||
if(m_isync==2) msgsent[37]=0;
|
if(m_isync==2) msgsent[37]=0;
|
||||||
|
Loading…
Reference in New Issue
Block a user