--- a/wlanutilities/wlansniffer/aiplugin/src/wsfconnectactivewrapper.cpp Fri Mar 12 15:48:54 2010 +0200
+++ b/wlanutilities/wlansniffer/aiplugin/src/wsfconnectactivewrapper.cpp Mon Mar 15 12:44:54 2010 +0200
@@ -95,7 +95,6 @@
void CWsfConnectActiveWrapper::DoCancel()
{
LOG_ENTERFN( "CWsfConnectActiveWrapper::DoCancel" );
- TRAP_IGNORE( iModel->AbortConnectingL() );
}
@@ -123,21 +122,28 @@
void CWsfConnectActiveWrapper::RunL()
{
LOG_ENTERFN( "CWsfConnectActiveWrapper::RunL" );
- if (iState == EUninitialized)
+ if ( iStatus == KErrNone )
{
- LOG_WRITE( "Start connect" );
- iModel->ConnectL( iPckg, iIapID, iPersistence, iStatus );
- iState = EInitialized;
- SetActive(); // Tell scheduler a request is active
+ if ( iState == EUninitialized )
+ {
+ LOG_WRITE( "Start connect" );
+ iModel->ConnectL( iPckg, iIapID, iPersistence, iStatus );
+ iState = EInitialized;
+ SetActive(); // Tell scheduler a request is active
+ }
+ else if ( iState == EInitialized )
+ {
+ LOG_WRITEF( "request result = %d", iPckg() );
+ iModel->SetConnectResultL( iPckg(), iIapID );
+ }
+ else
+ {
+ LOG_WRITEF( "iState = %d", iState );
+ }
}
- else if (iState == EInitialized )
- {
- LOG_WRITEF( "request result = %d", iPckg() );
- iModel->SetConnectResultL(iPckg(), iIapID );
- }
else
{
- LOG_WRITEF( "iState = %d", iState );
+ LOG_WRITEF( "ConnectActiveWrapper iStatus = %d", iStatus.Int() );
}
}