From: Michael Jerris <mike@jerris.com>
Date: Mon, 22 Jan 2007 17:16:25 +0000 (+0000)
Subject: rearrange a bit
X-Git-Tag: v1.0-beta1~1318
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4457fe7596aa0412b2ad792f9c05ea881fe9ce8d;p=thirdparty%2Ffreeswitch.git

rearrange a bit

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4016 d0543943-73ff-0310-b7d9-9358b9ac24b2
---

diff --git a/src/switch_core.c b/src/switch_core.c
index 8868a9c028..eb2bc83c49 100644
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -4237,13 +4237,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(int vg)
 
     switch_yield(1000000);
 
-	if (runtime.memory_pool) {
-		apr_pool_destroy(runtime.memory_pool);
-		if (!vg) {
-			apr_terminate();
-		}
-	}
-
 #ifdef WIN32
 	free(SWITCH_GLOBAL_dirs.base_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);
 #endif
 
+	if (runtime.memory_pool) {
+		apr_pool_destroy(runtime.memory_pool);
+		if (!vg) {
+			apr_terminate();
+		}
+	}
+
 	return SWITCH_STATUS_SUCCESS;
 }