mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 21:57:41 +02:00
Code Issues Releases Wiki Activity

* Some more Servent cleanup.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-01-28 12:30:07 +01:00
parent c0e77ac633
commit 03fd8cc6fd
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libtomahawk/network/Servent.cpp
View File

@@ -360,6 +360,7 @@ Servent::registerPeer( const Tomahawk::peerinfo_ptr& peerInfo )
} }
} }
void void
Servent::onSipInfoChanged() Servent::onSipInfoChanged()
{ {
@@ -704,8 +705,7 @@ Servent::connectToPeer( const peerinfo_ptr& peerInfo )
// try to find a ControlConnection with the same SipInfo, then we dont need to try to connect again // try to find a ControlConnection with the same SipInfo, then we dont need to try to connect again
foreach ( ControlConnection* c, m_controlconnections ) foreach ( ControlConnection* c, m_controlconnections )
{ {
if ( !c ) Q_ASSERT( c );
continue;
if ( c->id() == sipInfo.nodeId() ) if ( c->id() == sipInfo.nodeId() )
{ {
@@ -719,6 +719,7 @@ Servent::connectToPeer( const peerinfo_ptr& peerInfo )
{ {
isDupe = true; isDupe = true;
peerInfoDebug( currentPeerInfo ) << "Not adding, because it's a dupe: peerInfoCount remains the same" << conn->peerInfos().count(); peerInfoDebug( currentPeerInfo ) << "Not adding, because it's a dupe: peerInfoCount remains the same" << conn->peerInfos().count();
break;
} }
} }