From bec4224048a1433cca959dc0af55d523d6241509 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 3 Jun 2013 14:55:04 +0200 Subject: [PATCH] Remove hack to avoid resetting firstMessage on parallel connection --- src/libtomahawk/network/Servent.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/network/Servent.cpp b/src/libtomahawk/network/Servent.cpp index 76156b882..ebbebc534 100644 --- a/src/libtomahawk/network/Servent.cpp +++ b/src/libtomahawk/network/Servent.cpp @@ -824,7 +824,7 @@ Servent::initiateConnection( const SipInfo& sipInfo, Connection* conn ) return; } - if ( !sipInfo.key().isEmpty() && conn->firstMessage().isNull() ) + if ( conn->firstMessage().isNull() ) { QVariantMap m; m["conntype"] = "accept-offer"; @@ -898,7 +898,7 @@ Servent::reverseOfferRequest( ControlConnection* orig_conn, const QString& their m["key"] = theirkey; m["controlid"] = Database::instance()->impl()->dbid(); 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