Fix bug 1219.

If not authorized no dtp is created
so 0x000000000->close is likely to fail.

lpotter something I think Qtopia suffers from as well

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
@@ -324,49 +324,51 @@ ServerPI::ServerPI( int socket, QObject *parent, const char* name )
 	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() );