mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-01 03:40:16 +02:00
Code Issues Releases Wiki Activity

Only destroy existing ControlConnection if it does not run anymore

Browse Source
This commit is contained in:
Uwe L. Korn
2013-05-17 00:25:37 +02:00
parent 527fb86608
commit 16d30a1072
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -789,9 +789,16 @@ Servent::connectToPeer( const peerinfo_ptr& peerInfo )
peerInfoDebug( peerInfo ) << "connectToPeer: search for already established connections to the same nodeid:" << m_controlconnections.count() << "connections"; peerInfoDebug( peerInfo ) << "connectToPeer: search for already established connections to the same nodeid:" << m_controlconnections.count() << "connections";
if ( peerInfo->controlConnection() ) if ( peerInfo->controlConnection() )
{ {
peerInfoDebug( peerInfo ) << Q_FUNC_INFO << "deleting the existing Controlconnection"; if ( peerInfo->controlConnection()->isReady() && peerInfo->controlConnection()->isRunning() ) {
peerInfoDebug( peerInfo ) << Q_FUNC_INFO << "We have a running ControlConnection, so no use to connect.";
return;
}
else
{
peerInfoDebug( peerInfo ) << Q_FUNC_INFO << "deleting the existing ControlConnection";
delete peerInfo->controlConnection(); delete peerInfo->controlConnection();
} }
}
bool isDupe = false; bool isDupe = false;
ControlConnection* conn = 0; ControlConnection* conn = 0;