From 9723d7b4cea62776dd81a53caca5fd247fe751a1 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 17 May 2013 19:14:05 +0200 Subject: [PATCH] Do not delete the Connection in Socket cleanup, we take care of this at another stage. --- src/libtomahawk/network/Servent.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/libtomahawk/network/Servent.cpp b/src/libtomahawk/network/Servent.cpp index 0f210854d..88e388485 100644 --- a/src/libtomahawk/network/Servent.cpp +++ b/src/libtomahawk/network/Servent.cpp @@ -799,23 +799,11 @@ Servent::cleanupSocket( QTcpSocketExtra *sock ) return; } - if ( !sock->_conn.isNull() ) - { - Connection* conn = sock->_conn.data(); - - if ( !sock->_disowned ) - { - // connection will delete if we already transferred ownership, otherwise: - sock->deleteLater(); - } - - conn->markAsFailed(); // will emit failed, then finished - } - else + if ( sock->_conn.isNull() ) { tLog() << "SocketError, connection is null"; - sock->deleteLater(); } + sock->deleteLater(); } void