diff -r 8cb079868133 -r c26be94c8889 accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp --- a/accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp Wed Sep 01 12:34:26 2010 +0100 +++ b/accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp Tue Sep 14 23:45:36 2010 +0300 @@ -622,14 +622,16 @@ { COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::PromoteToConnectedL()" ); - iServerModel->RemovePhysicalConnection( aGenericID ); //Move GID from physical connection array - iServerModel->AddConnectionL( aGenericID ); //to connection array + if( KErrNotFound != iServerModel->RemovePhysicalConnection( aGenericID )) //Move GID from physical connection array + { + iServerModel->AddConnectionL( aGenericID ); //to connection array - iNotificationQueue->CompleteControlMessageL( ENewAccessoryConnected, - KErrNone, - aGenericID.UniqueID() ); + iNotificationQueue->CompleteControlMessageL( ENewAccessoryConnected, + KErrNone, + aGenericID.UniqueID() ); - iConnectionStatusHandler->IssueRequest(); + iConnectionStatusHandler->IssueRequest(); + } COM_TRACE_( "[AccFW:AccServer] CAccSrvConnectionController::PromoteToConnectedL - return void" ); }