fixes #513 - crash when connection fails

diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index c73d359..64d909f 100644 (file)
--- a/src/client/clientsyncer.cpp
+++ b/src/client/clientsyncer.cpp
@@ -91,8 +91,6 @@ void ClientSyncer::coreSocketError(QAbstractSocket::SocketError) {
 }
 
 void ClientSyncer::disconnectFromCore() {
 }
 
 void ClientSyncer::disconnectFromCore() {

-  if(_socket)
-    _socket->close();

   resetConnection();
 }
 
   resetConnection();
 }
 

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 256fbbc..058e3cd 100644 (file)
--- 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) {
 }
 
 bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item, bool compressed) {

+  if(!dev)
+    return false;
+

   QDataStream in(dev);
   in.setVersion(QDataStream::Qt_4_2);
 
   QDataStream in(dev);
   in.setVersion(QDataStream::Qt_4_2);