bugfixes

2 files changed, 19 insertions, 14 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index ebe761a..2e6b5c8 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -74,4 +74,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
 #endif
     mCommandSocket = 0;
+    mCommandSocketFinish = 0;
     mSyncActionDialog = 0;
     mServerSocket = 0;
@@ -1982,5 +1983,4 @@ void MainWindow::getFile(QSocket* socket)
 {
     setCaption( i18n("Receiving synced file...") );
-    qDebug("MainWindow::sendFile(QSocket* s) ");
    
     QString fileName = defaultFileName();
@@ -2069,8 +2069,10 @@ void MainWindow::performQuickQuick()
         return;
     }
-    if ( mCommandSocket )
-        delete mCommandSocket;
-    mCommandSocket = new QSocket( this );
-    connect( mCommandSocket, SIGNAL(readyRead()), this, SLOT(readFileFromSocket()) );
+    if ( !mCommandSocket ) {
+        mCommandSocket = new QSocket( this );
+    // delete mCommandSocket;
+    //mCommandSocket = new QSocket( this );
+        connect( mCommandSocket, SIGNAL(readyRead()), this, SLOT(readFileFromSocket()) );
+    }
     QString host = KOPrefs::instance()->mActiveSyncIP;
     mCommandSocket->connectToHost( host, port ); 
@@ -2113,7 +2115,7 @@ QString fileName;
     file.close();  
     mCommandSocket->close();
-    delete mCommandSocket;
+    //delete mCommandSocket;
     setCaption( i18n("Remote file saved to temp file.") );
-    mCommandSocket = 0;
+    //mCommandSocket = 0;
     mCurrentSyncProfile = 2 ; // last file
     mView->setSyncDevice(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] );
@@ -2139,8 +2141,10 @@ QString fileName;
     }
 
-    mCommandSocket = new QSocket( this );
-    QString host = KOPrefs::instance()->mActiveSyncIP;
-    mCommandSocket->connectToHost( KOPrefs::instance()->mActiveSyncIP, KOPrefs::instance()->mActiveSyncPort.toUInt() ); 
+    if ( !mCommandSocketFinish ) {
+    mCommandSocketFinish  = new QSocket( this );
+    }
+    mCommandSocketFinish->connectToHost( KOPrefs::instance()->mActiveSyncIP, KOPrefs::instance()->mActiveSyncPort.toUInt() ); 
 
+    QString host = KOPrefs::instance()->mActiveSyncIP;
     QFile file2( fileName );
     if (!file2.open( IO_ReadOnly ) ) {
@@ -2153,5 +2157,5 @@ QString fileName;
     QTextStream ts2( &file2 );
     ts2.setCodec( QTextCodec::codecForName("utf8") );
-    QTextStream os2( mCommandSocket );
+    QTextStream os2( mCommandSocketFinish );
     os2.setCodec( QTextCodec::codecForName("utf8") );
     //os.setEncoding( QTextStream::UnicodeUTF8 );
@@ -2164,8 +2168,8 @@ QString fileName;
         os2 << "STOP\r\n";
     }
-    mCommandSocket->close();
+    mCommandSocketFinish->close();
     file.close();
-    delete mCommandSocket;
-    mCommandSocket = 0;
+    //delete ( mCommandSocket);
+    //mCommandSocket = 0;
     qDebug("Syncing succesful! ");
     setCaption( i18n("Easy-Pi-Sync succesful!") );
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 9bb2302..5985d56 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -148,4 +148,5 @@ class MainWindow : public QMainWindow
   private:
     QSocket* mCommandSocket;
+    QSocket* mCommandSocketFinish;
     KServerSocket * mServerSocket;
     bool mClosed;