--- a/locationtriggering/ltcontainer/src/lbtcontainercompfilter.cpp Thu Aug 19 10:20:18 2010 +0300
+++ b/locationtriggering/ltcontainer/src/lbtcontainercompfilter.cpp Tue Aug 31 15:37:04 2010 +0300
@@ -88,7 +88,7 @@
TInt i;
if(contExtInfo!=NULL)
{
- if((isFilterPresent>0 && isEntryRequested && iHystRadiusArray.Count()>0) || (iHystRadiusArray.Count()>0 && isFilterPresent==0 ))
+ if( iHystRadiusArray.Count()>0)
{
isFilterPresent++;
isEntryRequested=EFalse;
@@ -104,8 +104,10 @@
}
- if((isFilterPresent>0 && isEntryRequested && iTriggerFiredArray.Count()>0) || (iTriggerFiredArray.Count()>0 && isFilterPresent==0 ))
+ if((isFilterPresent>0 && isEntryRequested ) || isFilterPresent==0 )
{
+ if(iTriggerFiredArray.Count()>0)
+ {
isFilterPresent++;
isEntryRequested=EFalse;
for(i=0;i<iTriggerFiredArray.Count();i++)
@@ -117,6 +119,7 @@
}
}
}
+ }
if((isFilterPresent>0 && isEntryRequested && iSidArray.Count()>0) || (iSidArray.Count()>0 && isFilterPresent==0 ))
{
@@ -182,19 +185,25 @@
case CLbtTriggerFilterBase::EFilterByAttribute:
{
CLbtContainerAttrFilter* attrFilter = CLbtContainerAttrFilter::NewL(filter,NULL);
- iFilterArray.Append(attrFilter);
+ CleanupStack::PushL( attrFilter );
+ iFilterArray.AppendL(attrFilter);
+ CleanupStack::Pop( attrFilter );
break;
}
case CLbtTriggerFilterBase::EFilterByArea:
{
CLbtContainerAreaFilter* areaFilter = CLbtContainerAreaFilter::NewL(filter,NULL);
- iFilterArray.Append(areaFilter);
+ CleanupStack::PushL( areaFilter );
+ iFilterArray.AppendL(areaFilter);
+ CleanupStack::Pop( areaFilter );
break;
}
case CLbtTriggerFilterBase::EFilterComposite:
{
CLbtContainerCompFilter* compFilter = CLbtContainerCompFilter::NewL(filter,NULL);
- iFilterArray.Append(compFilter);
+ CleanupStack::PushL( compFilter );
+ iFilterArray.AppendL(compFilter);
+ CleanupStack::Pop( compFilter );
break;
}
}