From d479c0930705ae25206e24e80b72f91af9d9e769 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Sat, 4 Jul 2020 20:23:00 +0200
Subject: [PATCH] moved one more settings in the settings class

---
 src/client.cpp    | 3 +--
 src/client.h      | 1 -
 src/clientdlg.cpp | 4 ++--
 src/settings.cpp  | 4 ++--
 src/settings.h    | 2 ++
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/client.cpp b/src/client.cpp
index 7330603e..f6e3580e 100755
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -31,8 +31,7 @@ CClient::CClient ( const quint16  iPortNumber,
                    const int      iCtrlMIDIChannel,
                    const bool     bNoAutoJackConnect,
                    const QString& strNClientName ) :
-    vstrIPAddress                    ( MAX_NUM_SERVER_ADDR_ITEMS, "" ),
-    ChannelInfo                      (),
+    ChannelInfo                      ( ),
     strClientName                    ( strNClientName ),
     Channel                          ( false ), /* we need a client channel -> "false" */
     CurOpusEncoder                   ( nullptr ),
diff --git a/src/client.h b/src/client.h
index 52a73b72..4ab5970d 100755
--- a/src/client.h
+++ b/src/client.h
@@ -278,7 +278,6 @@ public:
         { Channel.GetBufErrorRates ( vecErrRates, dLimit, dMaxUpLimit ); }
 
     // settings
-    CVector<QString> vstrIPAddress;
     CChannelCoreInfo ChannelInfo;
     QString          strClientName;
 
diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp
index 820bb1fb..1895a751 100755
--- a/src/clientdlg.cpp
+++ b/src/clientdlg.cpp
@@ -697,7 +697,7 @@ void CClientDlg::OnConnectDlgAccepted()
         {
             // store new address at the top of the list, if the list was already
             // full, the last element is thrown out
-            pClient->vstrIPAddress.StringFiFoWithCompare ( strSelectedAddress );
+            pSettings->vstrIPAddress.StringFiFoWithCompare ( strSelectedAddress );
         }
 
         // get name to be set in audio mixer group box title
@@ -881,7 +881,7 @@ void CClientDlg::SetMyWindowTitle ( const int iNumClients )
 void CClientDlg::ShowConnectionSetupDialog()
 {
     // init the connect dialog
-    ConnectDlg.Init ( pClient->vstrIPAddress );
+    ConnectDlg.Init ( pSettings->vstrIPAddress );
     ConnectDlg.SetCentralServerAddress ( NetworkUtil::GetCentralServerAddress ( pClient->GetCentralServerAddressType(),
                                                                                 pClient->GetServerListCentralServerAddress() ) );
 
diff --git a/src/settings.cpp b/src/settings.cpp
index 915f4395..dece629b 100755
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -221,7 +221,7 @@ void CClientSettings::ReadFromXML ( const QDomDocument& IniXMLDocument )
     // IP addresses
     for ( iIdx = 0; iIdx < MAX_NUM_SERVER_ADDR_ITEMS; iIdx++ )
     {
-        pClient->vstrIPAddress[iIdx] =
+        vstrIPAddress[iIdx] =
             GetIniSetting ( IniXMLDocument, "client",
                             QString ( "ipaddress%1" ).arg ( iIdx ), "" );
     }
@@ -554,7 +554,7 @@ void CClientSettings::WriteToXML ( QDomDocument& IniXMLDocument )
     {
         PutIniSetting ( IniXMLDocument, "client",
                         QString ( "ipaddress%1" ).arg ( iIdx ),
-                        pClient->vstrIPAddress[iIdx] );
+                        vstrIPAddress[iIdx] );
     }
 
     // stored fader tags
diff --git a/src/settings.h b/src/settings.h
index 00db6d06..cfada8a8 100755
--- a/src/settings.h
+++ b/src/settings.h
@@ -117,6 +117,7 @@ public:
         vecStoredFaderIsSolo        ( MAX_NUM_STORED_FADER_SETTINGS, false ),
         vecStoredFaderIsMute        ( MAX_NUM_STORED_FADER_SETTINGS, false ),
         vecStoredFaderGroupID       ( MAX_NUM_STORED_FADER_SETTINGS, INVALID_INDEX ),
+        vstrIPAddress               ( MAX_NUM_SERVER_ADDR_ITEMS, "" ),
         iNewClientFaderLevel        ( 100 ),
         bConnectDlgShowAllMusicians ( true ),
         vecWindowPosMain            ( ), // empty array
@@ -137,6 +138,7 @@ public:
     CVector<int>     vecStoredFaderIsSolo;
     CVector<int>     vecStoredFaderIsMute;
     CVector<int>     vecStoredFaderGroupID;
+    CVector<QString> vstrIPAddress;
     int              iNewClientFaderLevel;
     bool             bConnectDlgShowAllMusicians;