[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/oscar/liboscar
From:       Roman Jarosz <kedgedev () centrum ! cz>
Date:       2008-06-01 20:07:25
Message-ID: 1212350845.489897.31118.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 815439 by rjarosz:

Fix crash when socket emits RemoteHostClosedError error during disconnection in ClientStream destructor.
I can't test it because it not reproducible, but hopefully this will fix it.

BUG: 163020



 M  +6 -1      oscarclientstream.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/oscar/liboscar/oscarclientstream.cpp #815438:815439
@@ -288,7 +288,12 @@
 	kDebug(OSCAR_RAW_DEBUG) << " error: " << int(socketError);
 
 	d->noopTimer.stop();
-	d->socket->close();
+
+	if ( socketError == QAbstractSocket::RemoteHostClosedError )
+		d->socket->abort();
+	else
+		d->socket->close();
+
 	d->client.reset();
 
 	emit Stream::error( socketError );
[prev in list] [next in list] [prev in thread] [next in thread]