From 3282d98e3b3324f1b1fb573b03dca9e4e247417c Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Tue, 3 Feb 2009 15:24:58 +0100 Subject: [PATCH] fixes #513 - crash when connection fails --- src/client/clientsyncer.cpp | 2 -- src/common/signalproxy.cpp | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp index c73d3590..64d909fa 100644 --- a/src/client/clientsyncer.cpp +++ b/src/client/clientsyncer.cpp @@ -91,8 +91,6 @@ void ClientSyncer::coreSocketError(QAbstractSocket::SocketError) { } void ClientSyncer::disconnectFromCore() { - if(_socket) - _socket->close(); resetConnection(); } diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp index 256fbbcf..058e3cd8 100644 --- a/src/common/signalproxy.cpp +++ b/src/common/signalproxy.cpp @@ -936,6 +936,9 @@ void SignalProxy::writeDataToDevice(QIODevice *dev, const QVariant &item, bool c } bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item, bool compressed) { + if(!dev) + return false; + QDataStream in(dev); in.setVersion(QDataStream::Qt_4_2); -- 2.20.1