--- a/tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp Tue May 11 16:29:36 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp Wed Jun 09 10:00:50 2010 +0300
@@ -130,13 +130,7 @@
iLastFeedback == ETouchFeedbackSensitiveButton ||
iLastFeedback == ETouchFeedbackSensitiveList ||
iLastFeedback == ETouchFeedbackList ||
- iLastFeedback == ETouchFeedbackCheckbox ) )
- || (
- aFeedback == ETouchFeedbackPopUp &&
- (iLastFeedback == ETouchFeedbackIncreasingPopUp ||
- iLastFeedback == ETouchFeedbackOptionsMenuOpened ||
- iLastFeedback == ETouchFeedbackSubMenuOpened)
- );
+ iLastFeedback == ETouchFeedbackCheckbox ) );
}
// ---------------------------------------------------------------------------
@@ -172,6 +166,7 @@
else if ( IsHigherThanPlaying( aFeedback ) )
{
willPlay = ETrue;
+ StopFeedback();
}
if ( willPlay )
@@ -374,7 +369,7 @@
}
// ---------------------------------------------------------------------------
-// Stop continuous feedback.
+// Stop feedback.
// ---------------------------------------------------------------------------
//
void CTactileFeedbackResolver::StopFeedback()