From 10abcff239cebb19ca00e848abbaef545567e550 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Fri, 10 Jul 2020 20:32:08 +0200
Subject: [PATCH] since the server GUI custom central server address edit
 control is now in a different tab, it has to be read/write all the time

---
 ChangeLog         |  1 +
 src/serverdlg.cpp | 33 +++++----------------------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e59cd720..ec0cf46d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@
 - bug fix: grouping faders in the client should be proportional (see discussion in #202, #419)
 
 
+TODO server list/client list connection less message seems to need a mutex at the server
 
 TODO improve settings management -> move settings class in client/server classes, move actual settings variables
 TODO improve interaction between use of inifile and command line parameters (edited) #120
diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp
index 05ba19cf..ec427895 100755
--- a/src/serverdlg.cpp
+++ b/src/serverdlg.cpp
@@ -249,6 +249,9 @@ lvwClients->setMinimumHeight ( 140 );
     cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_CUSTOM ) );
     cbxCentServAddrType->setCurrentIndex ( static_cast<int> ( pServer->GetCentralServerAddressType() ) );
 
+    // custom central server address
+    edtCentralServerAddress->setText ( pServer->GetServerListCentralServerAddress() );
+
     // update server name line edit
     edtServerName->setText ( pServer->GetServerName() );
 
@@ -664,40 +667,14 @@ void CServerDlg::OnTimer()
 void CServerDlg::UpdateGUIDependencies()
 {
     // get the states which define the GUI dependencies from the server
-    const bool bCurSerListEnabled = pServer->GetServerListEnabled();
-
-    const bool bCurUseDefCentServAddr = ( pServer->GetCentralServerAddressType() != AT_CUSTOM );
-
-    const ESvrRegStatus eSvrRegStatus = pServer->GetSvrRegStatus();
+    const bool          bCurSerListEnabled = pServer->GetServerListEnabled();
+    const ESvrRegStatus eSvrRegStatus      = pServer->GetSvrRegStatus();
 
     // if register server is not enabled, we disable all the configuration
     // controls for the server list
     cbxCentServAddrType->setEnabled ( bCurSerListEnabled );
     grbServerInfo->setEnabled       ( bCurSerListEnabled );
 
-    // make sure the line edit does not fire signals when we update the text
-    edtCentralServerAddress->blockSignals ( true );
-    {
-        if ( bCurUseDefCentServAddr )
-        {
-            // if the default central server is used, just show a text of the
-            // server name
-            edtCentralServerAddress->setText ( tr ( "Predefined Address" ) );
-        }
-        else
-        {
-            // show the current user defined server address
-            edtCentralServerAddress->setText (
-                pServer->GetServerListCentralServerAddress() );
-        }
-    }
-    edtCentralServerAddress->blockSignals ( false );
-
-    // the line edit of the central server address is only enabled, if the
-    // server list is enabled and not the default address is used
-    edtCentralServerAddress->setEnabled (
-        !bCurUseDefCentServAddr && bCurSerListEnabled );
-
     QString strStatus = svrRegStatusToString ( eSvrRegStatus );
 
     switch ( eSvrRegStatus )