1 files changed, 3 insertions, 1 deletions

diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp
index eea9f3a..9519d11 100644
--- a/core/launcher/transferserver.cpp
+++ b/core/launcher/transferserver.cpp
@@ -300,97 +300,99 @@ ServerPI::ServerPI( int socket, QObject *parent, const char* name )
       storFileSize(-1)
 {
     state = Connected;
 
     setSocket( socket );
 
     peerport = peerPort();
     peeraddress = peerAddress();
 
 #ifndef INSECURE
     if ( !SyncAuthentication::isAuthorized(peeraddress) ) {
         state = Forbidden;
         startTimer( 0 );
     } else
 #endif
     {
         connect( this, SIGNAL( readyRead() ), SLOT( read() ) );
         connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) );
 
         passiv = FALSE;
         for( int i = 0; i < 4; i++ )
             wait[i] = FALSE;
 
         send( "220 Qtopia " QPE_VERSION " FTP Server" ); // No tr
         state = Wait_USER;
 
         dtp = new ServerDTP( this );
         connect( dtp, SIGNAL( completed() ), SLOT( dtpCompleted() ) );
         connect( dtp, SIGNAL( failed() ), SLOT( dtpFailed() ) );
         connect( dtp, SIGNAL( error( int ) ), SLOT( dtpError( int ) ) );
 
 
         directory = QDir::currentDirPath();
 
         static int p = 1024;
 
         while ( !serversocket || !serversocket->ok() ) {
             delete serversocket;
             serversocket = new ServerSocket( ++p, this );
         }
         connect( serversocket, SIGNAL( newIncomming( int ) ),
                  SLOT( newConnection( int ) ) );
     }
 }
 
 ServerPI::~ServerPI()
 {
     close();
-    dtp->close();
+
+    if ( dtp )
+        dtp->close();
     delete dtp;
     delete serversocket;
 }
 
 bool ServerPI::verifyAuthorised()
 {
     if ( !SyncAuthentication::isAuthorized(peerAddress()) ) {
         state = Forbidden;
         return FALSE;
     }
     return TRUE;
 }
 
 void ServerPI::connectionClosed()
 {
     // qDebug( "Debug: Connection closed" );
     emit connectionClosed(this);
 }
 
 void ServerPI::send( const QString& msg )
 {
     QTextStream os( this );
     os << msg << endl;
     //qDebug( "Reply: %s", msg.latin1() );
 }
 
 void ServerPI::read()
 {
     while ( canReadLine() )
         process( readLine().stripWhiteSpace() );
 }
 
 bool ServerPI::checkReadFile( const QString& file )
 {
     QString filename;
 
     if ( file[0] != "/" )
         filename = directory.path() + "/" + file;
     else
         filename = file;
 
     QFileInfo fi( filename );
     return ( fi.exists() && fi.isReadable() );
 }
 
 bool ServerPI::checkWriteFile( const QString& file )
 {
     QString filename;