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

Don't overwrite frequency, station or, macro models whenleaving the

Browse Source 
configuration dialog unless they have changed.

Fix a bug I had introduced into the free text message fields so they
don't get overwritten by message generation.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3981 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville
2014-04-03 21:19:04 +00:00
parent 5f53ce0dd2
commit 2c24d9be53
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Configuration.cpp
+17 -5
View File
@@ -1396,12 +1396,24 @@ void Configuration::impl::accept ()
TX_messages_ = ui_->TX_messages_check_box->isChecked ();
data_mode_ = static_cast<DataMode> (ui_->TX_mode_button_group->checkedId ());
save_directory_ = ui_->save_path_display_label->text ();
macros_.setStringList (next_macros_.stringList ());
frequencies_ = next_frequencies_.frequencies ();
frequencies_.sort (0);
stations_ = next_stations_.stations ();
stations_.sort (0);
if (macros_.stringList () != next_macros_.stringList ())
{
macros_.setStringList (next_macros_.stringList ());
}
if (frequencies_.frequencies () != next_frequencies_.frequencies ())
{
frequencies_ = next_frequencies_.frequencies ();
frequencies_.sort (0);
}
if (stations_.stations () != next_stations_.stations ())
{
stations_ = next_stations_.stations ();
stations_.sort (0);
}
write_settings (); // make visible to all
QDialog::accept();