1 files changed, 10 insertions, 2 deletions

diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 28af135..fad9a76 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -787,12 +787,14 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
     qDebug("MainWindow::deleteCommandSocket %d", state);
     
     //enum { success, errorW, errorR, quiet };
-    if ( state == KCommandSocket::errorR ) {
+    if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) {
          mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") );
         delete s;
+        if ( state == KCommandSocket::errorR ) {
         KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this );
         connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
         commandSocket->sendStop();
+        }
         return;
         
     } else  if ( state == KCommandSocket::errorW ) {
@@ -1137,7 +1139,13 @@ void KCommandSocket::deleteSocket()
     if ( mTimerSocket->isActive () ) {
       mTimerSocket->stop();
       KMessageBox::information( 0, i18n("ERROR:\nConnection to remote host timed out!\nDid you forgot to enable\nsyncing on remote host? "));
-      mRetVal = errorR;
+      mRetVal = errorTO;
+      if ( mSocket ) {
+        mSocket->close();
+        if ( mSocket->state() == QSocket::Idle )
+          deleteSocket();
+        return;
+      }
     }
     //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); 
     if ( mSocket)