From aef5c198bb1d7c789076e9a7ff12507c404616aa Mon Sep 17 00:00:00 2001
From: Uwe Risse <dg2ycb@gmx.de>
Date: Wed, 15 Feb 2023 17:22:44 +0100
Subject: [PATCH] Fix Contest Name not correctly remembered.

---
 Configuration.cpp      |  2 ++
 Configuration.ui       | 14 +++++++-------
 widgets/mainwindow.cpp |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Configuration.cpp b/Configuration.cpp
index c8652a599..ee67abc77 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -1542,6 +1542,8 @@ void Configuration::impl::read_settings ()
   Contest_Name_ = settings_->value ("Contest_Name",QString {}).toString ();
   ui_->Field_Day_Exchange->setText(FD_exchange_);
   ui_->RTTY_Exchange->setText(RTTY_exchange_);
+  ui_->Contest_Name->setText(Contest_Name_);
+
   if (next_font_.fromString (settings_->value ("Font", QGuiApplication::font ().toString ()).toString ())
       && next_font_ != font_)
     {
diff --git a/Configuration.ui b/Configuration.ui
index 1f91e09cd..acf225f5d 100644
--- a/Configuration.ui
+++ b/Configuration.ui
@@ -3076,13 +3076,13 @@ Right click for insert and delete options.</string>
                  </size>
                 </property>
                 <property name="text">
-                 <string>PACC</string>
+                 <string/>
                 </property>
                 <property name="maxLength">
                  <number>4</number>
                 </property>
                 <property name="cursorPosition">
-                 <number>2</number>
+                 <number>0</number>
                 </property>
                 <property name="alignment">
                  <set>Qt::AlignCenter</set>
@@ -3336,13 +3336,13 @@ Right click for insert and delete options.</string>
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="CAT_stop_bits_button_group"/>
-  <buttongroup name="CAT_handshake_button_group"/>
+  <buttongroup name="split_mode_button_group"/>
+  <buttongroup name="TX_audio_source_button_group"/>
+  <buttongroup name="special_op_activity_button_group"/>
   <buttongroup name="TX_mode_button_group"/>
+  <buttongroup name="CAT_handshake_button_group"/>
   <buttongroup name="CAT_data_bits_button_group"/>
   <buttongroup name="PTT_method_button_group"/>
-  <buttongroup name="split_mode_button_group"/>
-  <buttongroup name="special_op_activity_button_group"/>
-  <buttongroup name="TX_audio_source_button_group"/>
+  <buttongroup name="CAT_stop_bits_button_group"/>
  </buttongroups>
 </ui>
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index bfad377f2..331cb4627 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -5771,7 +5771,7 @@ void MainWindow::genCQMsg ()
        ( tlist.at(1)==my_callsign or
          tlist.at(2)==my_callsign ) and
        stdCall(my_callsign)) {
-      if(m_config.Individual_Contest_Name())  {
+      if(m_config.Individual_Contest_Name() && m_config.Contest_Name() != "")  {
            m_cqStr = m_config.Contest_Name();
       } else {
       if(SpecOp::NA_VHF == m_specOp)    m_cqStr="TEST";