# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1272376637 -10800
# Node ID 897fc24e7865eda1fb9331dfbc32da502029df37
# Parent  a4df7952b70645c0bdbee7558ec082f5b3de3a56
Revision: 201015
Kit: 201017

diff -r a4df7952b706 -r 897fc24e7865 tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp
--- a/tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp	Wed Apr 14 16:16:15 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp	Tue Apr 27 16:57:17 2010 +0300
@@ -158,9 +158,14 @@
     else if ( IsHigherThanPlaying( aFeedback ) )
         {
         willPlay = ETrue;
-        
-        iAudioPlayer->StopFeedback();
-        iHapticsPlayer->StopFeedback();
+        if( iAudioPlayer )
+            {
+            iAudioPlayer->StopFeedback();
+            }
+        if( iHapticsPlayer )
+            {
+            iHapticsPlayer->StopFeedback();
+            }
         }
 
     if ( willPlay )