diff -r ae942d28ec0e -r 2455ef1f5bbc javaextensions/sensor/src.s60/csensorbase.cpp --- a/javaextensions/sensor/src.s60/csensorbase.cpp Tue Aug 31 15:09:22 2010 +0300 +++ b/javaextensions/sensor/src.s60/csensorbase.cpp Wed Sep 01 12:33:18 2010 +0100 @@ -249,13 +249,14 @@ matched = ETrue; CSensorConditionBase *condition = iConditions[i]; iConditions.Remove(i); - - iSensorListener->ConditionMet( - condition, - condition->GetChannelId(), - currentValue, - javaTime); - + if (iSensorListener) + { + iSensorListener->ConditionMet( + condition, + condition->GetChannelId(), + currentValue, + javaTime); + } delete condition; } } @@ -263,7 +264,6 @@ // Also send all values separately if we have java side custom conditions if (iJavaConditionEval) { - if (iSensorListener != NULL) iSensorListener->ConditionMet(0, aChannelId, currentValue, javaTime); } return matched;