Merge branch 'release-2.5.0' of bitbucket.org:k1jt/wsjtx into release-2.5.0

This commit is contained in:
Joe Taylor 2021-07-01 13:22:20 -04:00
commit 872f767593

View File

@ -952,8 +952,8 @@ void MainWindow::closeEvent (QCloseEvent * e)
proc_m65.setReadChannel (QProcess::StandardError); proc_m65.setReadChannel (QProcess::StandardError);
proc_m65.readAll (); proc_m65.readAll ();
// allow time for any decode cycle to finish proc_m65.disconnect ();
if (!proc_m65.waitForFinished ()) proc_m65.kill(); if (!proc_m65.waitForFinished (1000)) proc_m65.kill();
quitFile.remove(); quitFile.remove();
mem_m65.detach(); mem_m65.detach();
if (m_astro_window) m_astro_window->close (); if (m_astro_window) m_astro_window->close ();