mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-04-15 08:29:45 +00:00
rearrange a bit
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4016 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
4a651581d2
commit
4457fe7596
@ -4237,13 +4237,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(int vg)
|
|||||||
|
|
||||||
switch_yield(1000000);
|
switch_yield(1000000);
|
||||||
|
|
||||||
if (runtime.memory_pool) {
|
|
||||||
apr_pool_destroy(runtime.memory_pool);
|
|
||||||
if (!vg) {
|
|
||||||
apr_terminate();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
free(SWITCH_GLOBAL_dirs.base_dir);
|
free(SWITCH_GLOBAL_dirs.base_dir);
|
||||||
free(SWITCH_GLOBAL_dirs.mod_dir);
|
free(SWITCH_GLOBAL_dirs.mod_dir);
|
||||||
@ -4256,6 +4249,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(int vg)
|
|||||||
free(SWITCH_GLOBAL_dirs.temp_dir);
|
free(SWITCH_GLOBAL_dirs.temp_dir);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (runtime.memory_pool) {
|
||||||
|
apr_pool_destroy(runtime.memory_pool);
|
||||||
|
if (!vg) {
|
||||||
|
apr_terminate();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user