mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 06:07:37 +02:00
Code Issues Releases Wiki Activity

Merge remote branch 'origin' into phonon

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-02-27 20:27:39 +01:00
parent c6d3599e47 dae300481e
commit 23e6670edf
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/network/servent.cpp
View File

@@ -346,7 +346,7 @@ Servent::createParallelConnection( Connection* orig_conn, Connection* new_conn,
{ {
qDebug() << "Servent::createParallelConnection, key:" << key << thread() << orig_conn; qDebug() << "Servent::createParallelConnection, key:" << key << thread() << orig_conn;
// if we can connect to them directly: // if we can connect to them directly:
if( orig_conn->outbound() ) if( orig_conn && orig_conn->outbound() )
{ {
qDebug() << "Connecting directly"; qDebug() << "Connecting directly";
connectToPeer( orig_conn->socket()->peerAddress().toString(), connectToPeer( orig_conn->socket()->peerAddress().toString(),