Ticket #646: Fixed panic E32USER-CBase 66 and leak of undeinit'ed stdlib when quitting symbian_ua_gui.

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2347 74dad513-b988-da41-8d7b-12977e46ad98

2 files changed, 4 insertions, 2 deletions

diff --git a/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp b/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp
index 7bb75177..155a9597 100644
--- a/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp
+++ b/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp
@@ -400,6 +400,8 @@ int symbian_ua_destroy()
     // Close connection and socket server

     aConn.Close();

     aSocketServer.Close();

+    

+    CloseSTDLIB();

 

     return PJ_SUCCESS;

 }

diff --git a/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp b/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp
index 70dd7ece..35f8463f 100644
--- a/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp
+++ b/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp
@@ -46,8 +46,6 @@ Csymbian_ua_guiAppUi::~Csymbian_ua_guiAppUi()
 	// [[[ begin generated region: do not modify [Generated Contents]

 	TRAPD( err_Dlg_wait_init, RemoveDlg_wait_initL() );

 	// ]]] end generated region [Generated Contents]

-

-	symbian_ua_destroy();

 	}

 

 // [[[ begin generated function: do not modify

@@ -80,6 +78,7 @@ void Csymbian_ua_guiAppUi::HandleCommandL( TInt aCommand )
 		{

 		if ( aCommand == EAknSoftkeyExit || aCommand == EEikCmdExit )

 			{

+		    	symbian_ua_destroy();

 			Exit();

 			}

 		}

@@ -157,6 +156,7 @@ void Csymbian_ua_guiAppUi::ConstructL()
 	

 	// Init PJSUA

 	if (symbian_ua_init() != 0) {

+	    symbian_ua_destroy();

 	    Exit();

 	}