w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-22 03:58:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.3.0' into develop

Browse Source
This commit is contained in:
Bill Somerville 2020-10-21 13:37:37 +01:00
commit c444cb2409
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1437,7 +1437,7 @@ else ()
)
if (WIN32)
set_target_properties (wsjtx PROPERTIES
LINK_FLAGS -Wl,--stack,0x400000,--heap,0x20000000
LINK_FLAGS -Wl,--stack,0x1000000,--heap,0x20000000
)
endif ()
endif ()

6
widgets/mainwindow.cpp
View File

@ -9117,15 +9117,15 @@ void MainWindow::write_all(QString txRx, QString message)
QString msg;
QString mode_string;
if (message[4]==' ') {
if (message.size () > 5 && message[4]==' ') {
msg=message.mid(4,-1);
} else {
msg=message.mid(6,-1);
}
if (message[19]=='#') {
if (message.size () > 19 && message[19]=='#') {
mode_string="JT65 ";
} else if (message[19]=='@') {
} else if (message.size () > 19 && message[19]=='@') {
mode_string="JT9 ";
} else {
mode_string=m_mode.leftJustified(6,' ');