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

merge fixes

Browse source
This commit is contained in:
Volker Fischer 2020-04-19 12:15:36 +02:00
parent e44e739708
commit 6f962aae4f
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/serverlist.cpp
View file

@ -479,8 +479,6 @@ void CServerListManager::CentralServerQueryServerList ( const CHostAddress& Inet
/* Slave server functionality *************************************************/ /* Slave server functionality *************************************************/
void CServerListManager::StoreRegistrationResult ( ESvrRegResult eResult ) void CServerListManager::StoreRegistrationResult ( ESvrRegResult eResult )
{ {
qInfo() << "Server Registration Result received:" << svrRegResultToString ( eResult );
// we need the lock since the user might change the server properties at // we need the lock since the user might change the server properties at
// any time so another response could arrive // any time so another response could arrive
QMutexLocker locker ( &Mutex ); QMutexLocker locker ( &Mutex );
@ -492,14 +490,16 @@ void CServerListManager::StoreRegistrationResult ( ESvrRegResult eResult )
{ {
case ESvrRegResult::SRR_REGISTERED: case ESvrRegResult::SRR_REGISTERED:
SetSvrRegStatus ( ESvrRegStatus::SRS_REGISTERED ); SetSvrRegStatus ( ESvrRegStatus::SRS_REGISTERED );
return; break;
case ESvrRegResult::SRR_CENTRAL_SVR_FULL: case ESvrRegResult::SRR_CENTRAL_SVR_FULL:
SetSvrRegStatus ( ESvrRegStatus::SRS_CENTRAL_SVR_FULL ); SetSvrRegStatus ( ESvrRegStatus::SRS_CENTRAL_SVR_FULL );
return; break;
}
SetSvrRegStatus ( ESvrRegStatus::SRS_UNKNOWN_RESP ); default:
SetSvrRegStatus ( ESvrRegStatus::SRS_UNKNOWN_RESP );
break;
}
} }
void CServerListManager::OnTimerPingCentralServer() void CServerListManager::OnTimerPingCentralServer()
@ -581,12 +581,15 @@ void CServerListManager::SlaveServerRegisterServer ( const bool bIsRegister )
else else
{ {
SetSvrRegStatus ( SRS_BAD_ADDRESS ); SetSvrRegStatus ( SRS_BAD_ADDRESS );
emit SvrRegStatusChanged();
} }
} }
void CServerListManager::SetSvrRegStatus ( ESvrRegStatus eNSvrRegStatus ) void CServerListManager::SetSvrRegStatus ( ESvrRegStatus eNSvrRegStatus )
{ {
// output regirstation result/update on the console
qInfo() << "Server Registration Status update:" << svrRegStatusToString ( eNSvrRegStatus ); qInfo() << "Server Registration Status update:" << svrRegStatusToString ( eNSvrRegStatus );
// store the state and inform the GUI about the new status
eSvrRegStatus = eNSvrRegStatus; eSvrRegStatus = eNSvrRegStatus;
emit SvrRegStatusChanged(); emit SvrRegStatusChanged();
} }