diff -r 9abfd4f00d37 -r 9660a5eb236f eapol/eapol_framework/eapol_symbian/eap_server/src/eap_am_general_settings_symbian.cpp --- a/eapol/eapol_framework/eapol_symbian/eap_server/src/eap_am_general_settings_symbian.cpp Mon May 24 20:32:47 2010 +0300 +++ b/eapol/eapol_framework/eapol_symbian/eap_server/src/eap_am_general_settings_symbian.cpp Thu May 27 10:23:43 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 51 % +* %version: 52 % */ #include "eap_tools.h" @@ -136,6 +136,9 @@ CloseGeneralSettings(); + delete iCertificateFetcher; + iCertificateFetcher = 0; + EAP_ASSERT(m_shutdown_was_called == true); } @@ -184,9 +187,6 @@ EAP_TRACE_RETURN_STRING(m_am_tools, "returns: eap_am_general_settings_symbian_c::shutdown()"); - delete iCertificateFetcher; - iCertificateFetcher = 0; - m_shutdown_was_called = true; return EAP_STATUS_RETURN(m_am_tools, eap_status_ok);