2 files changed, 6 insertions, 2 deletions
diff --git a/pjsip-apps/src/pjsua/main.c b/pjsip-apps/src/pjsua/main.c
index f3160092..b7f6af5d 100644
--- a/pjsip-apps/src/pjsua/main.c
+++ b/pjsip-apps/src/pjsua/main.c
@@ -82,6 +82,9 @@ int main(int argc, char *argv[])
     app_main();
     app_destroy();
 
+    /* This is on purpose */
+    app_destroy();
+
     return 0;
 }
 
diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c
index 6d3739c2..acad452b 100644
--- a/pjsip-apps/src/pjsua/pjsua_app.c
+++ b/pjsip-apps/src/pjsua/pjsua_app.c
@@ -95,6 +95,7 @@ static pj_str_t		uri_arg;
 #ifdef STEREO_DEMO
 static void stereo_demo();
 #endif
+pj_status_t app_destroy(void);
 
 /*****************************************************************************
  * Configuration manipulation
@@ -3086,7 +3087,7 @@ pj_status_t app_init(int argc, char *argv[])
     return PJ_SUCCESS;
 
 on_error:
-    pjsua_destroy();
+    app_destroy();
     return status;
 }
 
@@ -3098,7 +3099,7 @@ pj_status_t app_main(void)
     /* Start pjsua */
     status = pjsua_start();
     if (status != PJ_SUCCESS) {
-	pjsua_destroy();
+	app_destroy();
 	return status;
     }