mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-07-31 13:12:30 -04:00
Merge branch 'release-2.3.0' into develop
This commit is contained in:
commit
c444cb2409
@ -1437,7 +1437,7 @@ else ()
|
|||||||
)
|
)
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set_target_properties (wsjtx PROPERTIES
|
set_target_properties (wsjtx PROPERTIES
|
||||||
LINK_FLAGS -Wl,--stack,0x400000,--heap,0x20000000
|
LINK_FLAGS -Wl,--stack,0x1000000,--heap,0x20000000
|
||||||
)
|
)
|
||||||
endif ()
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
|
@ -9117,15 +9117,15 @@ void MainWindow::write_all(QString txRx, QString message)
|
|||||||
QString msg;
|
QString msg;
|
||||||
QString mode_string;
|
QString mode_string;
|
||||||
|
|
||||||
if (message[4]==' ') {
|
if (message.size () > 5 && message[4]==' ') {
|
||||||
msg=message.mid(4,-1);
|
msg=message.mid(4,-1);
|
||||||
} else {
|
} else {
|
||||||
msg=message.mid(6,-1);
|
msg=message.mid(6,-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (message[19]=='#') {
|
if (message.size () > 19 && message[19]=='#') {
|
||||||
mode_string="JT65 ";
|
mode_string="JT65 ";
|
||||||
} else if (message[19]=='@') {
|
} else if (message.size () > 19 && message[19]=='@') {
|
||||||
mode_string="JT9 ";
|
mode_string="JT9 ";
|
||||||
} else {
|
} else {
|
||||||
mode_string=m_mode.leftJustified(6,' ');
|
mode_string=m_mode.leftJustified(6,' ');
|
||||||
|
Loading…
x
Reference in New Issue
Block a user