w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-11 02:09:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move temporary directory creation and deletion outside of MainWindow

Browse Source 
Changing configuration causes  WSJT-X and JTAlert to get  into a fight
for the temporary directory. By moving the creation and clearup of the
temporary directory outside  of the configurations loop  this issue is
minimized to no worse than before multiple configurations were added.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6630 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville
2016-04-20 21:59:22 +00:00
parent 84d6a667f1
commit e7f532deb5
5 changed files with 57 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Configuration.cpp
+8 -38
View File
@@ -344,7 +344,8 @@ public:
using FrequencyDelta = Radio::FrequencyDelta;
using port_type = Configuration::port_type;
explicit impl (Configuration * self, QSettings * settings, QWidget * parent);
explicit impl (Configuration * self, QDir const& temp_directory,
QSettings * settings, QWidget * parent);
~impl ();
bool have_rig ();
@@ -564,8 +565,9 @@ private:
// delegate to implementation class
Configuration::Configuration (QSettings * settings, QWidget * parent)
: m_ {this, settings, parent}
Configuration::Configuration (QDir const& temp_directory,
QSettings * settings, QWidget * parent)
: m_ {this, temp_directory, settings, parent}
{
}
@@ -734,13 +736,15 @@ void Configuration::sync_transceiver (bool force_signal, bool enforce_mode_and_s
}
}
Configuration::impl::impl (Configuration * self, QSettings * settings, QWidget * parent)
Configuration::impl::impl (Configuration * self, QDir const& temp_directory,
QSettings * settings, QWidget * parent)
: QDialog {parent}
, self_ {self}
, ui_ {new Ui::configuration_dialog}
, settings_ {settings}
, doc_dir_ {QApplication::applicationDirPath ()}
, data_dir_ {QApplication::applicationDirPath ()}
, temp_dir_ {temp_directory}
, frequencies_ {&bands_}
, next_frequencies_ {&bands_}
, stations_ {&bands_}
@@ -805,39 +809,6 @@ Configuration::impl::impl (Configuration * self, QSettings * settings, QWidget *
data_dir_.cd (WSJT_DATA_DESTINATION);
#endif
{
// Create a temporary directory in a suitable location
QString temp_location {QStandardPaths::writableLocation (QStandardPaths::TempLocation)};
if (!temp_location.isEmpty ())
{
temp_dir_.setPath (temp_location);
}
bool ok {false};
QString unique_directory {QApplication::applicationName ()};
do
{
if (!temp_dir_.mkpath (unique_directory)
|| !temp_dir_.cd (unique_directory))
{
QMessageBox::critical (this, "WSJT-X", tr ("Create temporary directory error: ") + temp_dir_.absolutePath ());
throw std::runtime_error {"Failed to create a temporary directory"};
}
if (!temp_dir_.isReadable () || !(ok = QTemporaryFile {temp_dir_.absoluteFilePath ("test")}.open ()))
{
if (QMessageBox::Cancel == QMessageBox::critical (this, "WSJT-X",
tr ("Create temporary directory error:\n%1\n"
"Another application may be locking the directory").arg (temp_dir_.absolutePath ()),
QMessageBox::Retry | QMessageBox::Cancel))
{
throw std::runtime_error {"Failed to create a usable temporary directory"};
}
temp_dir_.cdUp (); // revert to parent as this one is no good
}
}
while (!ok);
}
{
// Find a suitable data file location
QDir data_dir {QStandardPaths::writableLocation (QStandardPaths::DataLocation)};
@@ -1034,7 +1005,6 @@ Configuration::impl::~impl ()
transceiver_thread_->quit ();
transceiver_thread_->wait ();
write_settings ();
temp_dir_.removeRecursively (); // clean up temp files
}
void Configuration::impl::initialize_models ()