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

* Use nodeID instead of Connection ID.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2010-11-29 08:06:59 +01:00
parent d4a57eb833
commit eb62b0d4c6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/servent.cpp
View File

@@ -325,7 +325,7 @@ Servent::createParallelConnection( Connection* orig_conn, Connection* new_conn,
m.insert( "key", tmpkey ); m.insert( "key", tmpkey );
m.insert( "offer", key ); m.insert( "offer", key );
m.insert( "port", externalPort() ); m.insert( "port", externalPort() );
m.insert( "controlid", orig_conn->id() ); m.insert( "controlid", APP->nodeID() );
QJson::Serializer ser; QJson::Serializer ser;
orig_conn->sendMsg( Msg::factory( ser.serialize(m), Msg::JSON ) ); orig_conn->sendMsg( Msg::factory( ser.serialize(m), Msg::JSON ) );
@@ -469,7 +469,7 @@ Servent::reverseOfferRequest( ControlConnection* orig_conn, const QString& key,
m["conntype"] = "push-offer"; m["conntype"] = "push-offer";
m["key"] = theirkey; m["key"] = theirkey;
m["port"] = externalPort(); m["port"] = externalPort();
m["controlid"] = orig_conn->id(); m["controlid"] = APP->nodeID();
new_conn->setFirstMessage( m ); new_conn->setFirstMessage( m );
createParallelConnection( orig_conn, new_conn, QString() ); createParallelConnection( orig_conn, new_conn, QString() );
} }

2
src/transferview.cpp
View File

@@ -70,8 +70,8 @@ TransferView::fileTransferFinished( FileTransferConnection* ftc )
void void
TransferView::onTransferUpdate() TransferView::onTransferUpdate()
{ {
qDebug() << Q_FUNC_INFO;
FileTransferConnection* ftc = (FileTransferConnection*)sender(); FileTransferConnection* ftc = (FileTransferConnection*)sender();
qDebug() << Q_FUNC_INFO << ftc->track().isNull() << ftc->source().isNull();
if ( ftc->track().isNull() || ftc->source().isNull() ) if ( ftc->track().isNull() || ftc->source().isNull() )
return; return;