eeva/jamulus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug fix: IP address was not shown on empty name tag

Browse Source
This commit is contained in:
Volker Fischer 2013-03-01 17:15:29 +00:00
parent 797a991417
commit f9b13ec2f6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/audiomixerboard.cpp
View File

@ -462,12 +462,9 @@ void CAudioMixerBoard::ApplyNewConClientList ( CVector<CChannelInfo>& vecChanInf
vecpChanFader[i]->ResetSoloState(); 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 ) ) 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 // the text has actually changed, search in the list of
// stored gains if we have a matching entry // stored gains if we have a matching entry
const int iStoredFaderLevel = const int iStoredFaderLevel =
@ -481,6 +478,9 @@ void CAudioMixerBoard::ApplyNewConClientList ( CVector<CChannelInfo>& vecChanInf
} }
} }
// set the text in the fader
vecpChanFader[i]->SetText ( vecChanInfo[j] );
// update other channel infos (only available for new protocol // update other channel infos (only available for new protocol
// which is not compatible with old versions -> this way we make // which is not compatible with old versions -> this way we make
// sure that the protocol which transferrs only the name does // sure that the protocol which transferrs only the name does