From f9b13ec2f6311ac2b788adf056d0b0ea49249ff4 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Fri, 1 Mar 2013 17:15:29 +0000 Subject: [PATCH] bug fix: IP address was not shown on empty name tag --- src/audiomixerboard.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp index 54318ac3..042148e2 100755 --- a/src/audiomixerboard.cpp +++ b/src/audiomixerboard.cpp @@ -462,12 +462,9 @@ void CAudioMixerBoard::ApplyNewConClientList ( CVector& vecChanInf vecpChanFader[i]->ResetSoloState(); } - // update text (if different from the current one) + // restore gain (if new name is different from the current one) if ( vecpChanFader[i]->GetReceivedName().compare ( vecChanInfo[j].strName ) ) { - // set the text in the fader - vecpChanFader[i]->SetText ( vecChanInfo[j] ); - // the text has actually changed, search in the list of // stored gains if we have a matching entry const int iStoredFaderLevel = @@ -481,6 +478,9 @@ void CAudioMixerBoard::ApplyNewConClientList ( CVector& vecChanInf } } + // set the text in the fader + vecpChanFader[i]->SetText ( vecChanInfo[j] ); + // update other channel infos (only available for new protocol // which is not compatible with old versions -> this way we make // sure that the protocol which transferrs only the name does