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

Remove hack to avoid resetting firstMessage on parallel connection

Browse Source
This commit is contained in:
Uwe L. Korn
2013-06-03 14:55:04 +02:00
parent 83d49a6324
commit bec4224048
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -824,7 +824,7 @@ Servent::initiateConnection( const SipInfo& sipInfo, Connection* conn )
return; return;
} }
if ( !sipInfo.key().isEmpty() && conn->firstMessage().isNull() ) if ( conn->firstMessage().isNull() )
{ {
QVariantMap m; QVariantMap m;
m["conntype"] = "accept-offer"; m["conntype"] = "accept-offer";
@@ -898,7 +898,7 @@ Servent::reverseOfferRequest( ControlConnection* orig_conn, const QString& their
m["key"] = theirkey; m["key"] = theirkey;
m["controlid"] = Database::instance()->impl()->dbid(); m["controlid"] = Database::instance()->impl()->dbid();
new_conn->setFirstMessage( m ); new_conn->setFirstMessage( m );
createParallelConnection( orig_conn, new_conn, QString() ); createParallelConnection( orig_conn, new_conn, theirkey );
} }
// return the appropriate connection for a given offer key, or NULL if invalid // return the appropriate connection for a given offer key, or NULL if invalid