From 21524d66529806cfdb0dc056ff5628becfc8d7c5 Mon Sep 17 00:00:00 2001 From: Jeremy McNamara Date: Mon, 12 May 2003 03:57:43 +0000 Subject: [PATCH] tweak the logic in MakeCall git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1001 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/h323/ast_h323.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/channels/h323/ast_h323.cpp b/channels/h323/ast_h323.cpp index e4fe560b86..51469087b3 100755 --- a/channels/h323/ast_h323.cpp +++ b/channels/h323/ast_h323.cpp @@ -185,7 +185,8 @@ int MyH323EndPoint::MakeCall(const PString & dest, PString & token, unsigned int *callReference, unsigned int port) { PString fullAddress; - + MyH323Connection * connection; + /* Determine whether we are using a gatekeeper or not. */ if (GetGatekeeper() != NULL) { fullAddress = dest; @@ -197,18 +198,14 @@ int MyH323EndPoint::MakeCall(const PString & dest, PString & token, cout << " -- Making call to " << fullAddress << "." << endl; } - if (!H323EndPoint::MakeCall(fullAddress, token)) { + if (!(connection = (MyH323Connection *)H323EndPoint::MakeCallLocked(fullAddress, token))) { if (h323debug) cout << "Error making call to \"" << fullAddress << '"' << endl; return 1; } - MyH323Connection * connection = (MyH323Connection *)FindConnectionWithLock(token); - - if (connection != NULL) { - *callReference = connection->GetCallReference(); - connection->Unlock(); - } + *callReference = connection->GetCallReference(); + connection->Unlock(); if (h323debug) { cout << " -- " << GetLocalUserName() << " is calling host " << fullAddress << endl;