w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-01 05:32:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop

Browse Source
This commit is contained in:
Joe Taylor 2023-06-23 12:58:17 -04:00
commit 60dbba359b
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
models/FrequencyList.cpp
View File

@ -1335,8 +1335,8 @@ FrequencyList_v2_101::FrequencyItems FrequencyList_v2_101::from_json_file(QFile
{ {
throw ReadFileException{tr ("No Frequencies were found")}; throw ReadFileException{tr ("No Frequencies were found")};
} }
int valid_entry_count = 0; int valid_entry_count [[maybe_unused]] = 0;
int skipped_entry_count = 0; int skipped_entry_count [[maybe_unused]] = 0;
for (auto const &item: arr) for (auto const &item: arr)
{ {
QString mode_s, region_s; QString mode_s, region_s;

17
widgets/mainwindow.cpp
View File

@ -470,17 +470,12 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
m_optimizingProgress.setMinimumDuration (15000); // only show after 15s delay m_optimizingProgress.setMinimumDuration (15000); // only show after 15s delay
//Attach or create a memory segment to be shared with QMAP. //Attach or create a memory segment to be shared with QMAP.
int memSize=4096; int memSize=4096;
if(!mem_qmap.attach()) { if(!mem_qmap.attach()) mem_qmap.create(memSize);
if(!mem_qmap.create(memSize)) { ipc_qmap = (int*)mem_qmap.data();
MessageBox::information_message (this, mem_qmap.lock();
"Unable to create shared memory segment mem_qmap."); memset(ipc_qmap,0,memSize); //Zero all of QMAP shared memory
} mem_qmap.unlock();
}
ipc_qmap = (int*)mem_qmap.data();
mem_qmap.lock();
memset(ipc_qmap,0,memSize); //Zero all of QMAP shared memory
mem_qmap.unlock();
// Closedown. // Closedown.
connect (ui->actionExit, &QAction::triggered, this, &QMainWindow::close); connect (ui->actionExit, &QAction::triggered, this, &QMainWindow::close);