diff -r 7d48bed6ce0c -r 987c9837762f phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvEmergencyRequestManager.cpp --- a/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvEmergencyRequestManager.cpp Tue Aug 31 15:45:17 2010 +0300 +++ b/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvEmergencyRequestManager.cpp Wed Sep 01 12:15:03 2010 +0100 @@ -18,9 +18,9 @@ // INCLUDES -#include "cphsrvemergencyrequestmanager.h" -#include "cphsrvsubsessionbase.h" -#include "phsrvutils.h" +#include "CPhSrvEmergencyRequestManager.h" +#include "CPhSrvSubSessionBase.h" +#include "PhSrvUtils.h" // CONSTANTS @@ -127,11 +127,10 @@ // void CPhSrvEmergencyRequestManager::EmergencyDialCancel() { - // Clear pending request status - iIsRequestPending = EFalse; - if ( !iPendingRequestPointer.IsNull() ) { + // Clear pending request status + iIsRequestPending = EFalse; iPendingRequestPointer.Complete( KErrCancel ); } }