diff -r 594d59766373 -r 7d48bed6ce0c phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvEmergencyRequestManager.cpp --- a/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvEmergencyRequestManager.cpp Thu Aug 19 10:28:14 2010 +0300 +++ b/phoneclientserver/phoneserver/Src/Standard/Standard_Aiw/CPhSrvEmergencyRequestManager.cpp Tue Aug 31 15:45:17 2010 +0300 @@ -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,10 +127,11 @@ // void CPhSrvEmergencyRequestManager::EmergencyDialCancel() { + // Clear pending request status + iIsRequestPending = EFalse; + if ( !iPendingRequestPointer.IsNull() ) { - // Clear pending request status - iIsRequestPending = EFalse; iPendingRequestPointer.Complete( KErrCancel ); } }