diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-04-29 12:31:51 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-04-29 12:31:51 +0000 |
| commit | 6ccf843852b13b86cbf86d18196f4addcb8de0fe (patch) | |
| tree | dea6b651255b56c9fdaf21b51d923108c4950378 /pjsip | |
| parent | e55918f450445626724cae4781a2d16f2b1e2067 (diff) | |
Fixed ticket #242: Crash on Windows when no sound device is available
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/split-3rd-party@1224 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_core.c | 17 | ||||
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_media.c | 6 |
2 files changed, 11 insertions, 12 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index 96ca174a..8a0e93e5 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -917,20 +917,19 @@ PJ_DEF(pj_status_t) pjsua_destroy(void) pj_pool_release(pjsua_var.pool); pjsua_var.pool = NULL; pj_caching_pool_destroy(&pjsua_var.cp); - } + PJ_LOG(4,(THIS_FILE, "PJSUA destroyed...")); - PJ_LOG(4,(THIS_FILE, "PJSUA destroyed...")); + /* End logging */ + if (pjsua_var.log_file) { + pj_file_close(pjsua_var.log_file); + pjsua_var.log_file = NULL; + } - /* End logging */ - if (pjsua_var.log_file) { - pj_file_close(pjsua_var.log_file); - pjsua_var.log_file = NULL; + /* Shutdown PJLIB */ + pj_shutdown(); } - /* Shutdown PJLIB */ - pj_shutdown(); - /* Clear pjsua_var */ pj_bzero(&pjsua_var, sizeof(pjsua_var)); diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index 09c65cbf..80e4383e 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -476,10 +476,10 @@ pj_status_t pjsua_media_subsys_destroy(void) pjmedia_endpt_destroy(pjsua_var.med_endpt); pjsua_var.med_endpt = NULL; - } - /* Deinitialize sound subsystem */ - pjmedia_snd_deinit(); + /* Deinitialize sound subsystem */ + pjmedia_snd_deinit(); + } /* Reset RTP port */ next_rtp_port = 0; |