Merge branch 'master' into HitNotBLE
# Conflicts: # SelectableCore.cpp # SelectableCore.h
This commit is contained in:
@@ -63,6 +63,27 @@ CSelectableBare::~CSelectableBare()
|
||||
}
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
CDataMember * CSelectableBare::GetHandleAddress( THandle * Handle, const char * HandleRef )
|
||||
{
|
||||
CDataMember * AddressDef = NULL;
|
||||
char NamePath[100];
|
||||
char * Address;
|
||||
|
||||
// Handle renamed?
|
||||
sprintf( NamePath, "Application/Addresses/Rename/%s", HandleRef );
|
||||
if (!(Address = (char*)Application->Config->GetChStr( NamePath, NULL, false ))) {
|
||||
Address = (char*)HandleRef;
|
||||
}
|
||||
|
||||
// Get address def
|
||||
if ((AddressDef = Application->AddressList->GetChild( Address ))) {
|
||||
if (Log) Log->Message( LogLevel, dlMedium, "%s/%s: Handle '%s' - Use address '%s' ('%s')",
|
||||
ProcessName, Name, Handle->Name, Address, HandleRef );
|
||||
}
|
||||
return AddressDef;
|
||||
}
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
THandle * CSelectableBare::CreateHandle( const char * HandleName, bool CreateChannel )
|
||||
{
|
||||
THandle ** Handle = NULL;
|
||||
|
||||
Reference in New Issue
Block a user