summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--addons/ooh323c/src/ooCalls.c3
-rw-r--r--addons/ooh323c/src/ooq931.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/addons/ooh323c/src/ooCalls.c b/addons/ooh323c/src/ooCalls.c
index 046b5fcf4..70677ab0a 100644
--- a/addons/ooh323c/src/ooCalls.c
+++ b/addons/ooh323c/src/ooCalls.c
@@ -265,14 +265,13 @@ int ooEndCall(OOH323CallData *call)
int ooRemoveCallFromList (OOH323CallData *call)
{
- if(!call)
+ if(!call || !gH323ep.callList)
return OO_OK;
ast_mutex_lock(&callListLock);
OOTRACEINFO3("Removing call %lx: %s\n", call, call->callToken);
- if (!gH323ep.callList) return OO_OK;
if(call == gH323ep.callList)
{
if(!call->next)
diff --git a/addons/ooh323c/src/ooq931.c b/addons/ooh323c/src/ooq931.c
index 202595f5d..fb9526915 100644
--- a/addons/ooh323c/src/ooq931.c
+++ b/addons/ooh323c/src/ooq931.c
@@ -2373,7 +2373,7 @@ int ooH323MakeCall(char *dest, char *callToken, ooCallOptions *opts)
else
OO_CLRFLAG(call->flags, OO_M_TUNNELING);
- if(opts->disableGk)
+ if(opts->disableGk || gH323ep.gkClient == NULL)
OO_SETFLAG(call->flags, OO_M_DISABLEGK);
else
OO_CLRFLAG(call->flags, OO_M_DISABLEGK);