From fc9195fe60987da1f389485d1e4b53f5deeecad8 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthony.minessale@gmail.com>
Date: Wed, 20 Jun 2007 14:50:02 +0000
Subject: [PATCH] avoiding deadlock
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5423 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
src/switch_channel.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/switch_channel.c b/src/switch_channel.c
index 4bf7337ace..f8289eb5af 100644
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -319,9 +319,10 @@ SWITCH_DECLARE(char *) switch_channel_get_variable(switch_channel_t *channel, co
if (!(v = switch_core_hash_find(channel->variables, varname))) {
if (!channel->caller_profile || !(v = switch_caller_get_field_by_name(channel->caller_profile, varname))) {
if (!strcmp(varname, "base_dir")) {
- return SWITCH_GLOBAL_dirs.base_dir;
+ v = SWITCH_GLOBAL_dirs.base_dir;
+ } else {
+ v = switch_core_get_variable(varname);
}
- v = switch_core_get_variable(varname);
}
}
switch_mutex_unlock(channel->profile_mutex);