# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1268401430 -7200
# Node ID e0d1d162996134dd9719356482f8ea5eb4b5f9b9
# Parent  0a5ec9af4050e908fb0c59b3245d33cf8097bc12
Revision: 201006
Kit: 201008

diff -r 0a5ec9af4050 -r e0d1d1629961 tacticonserver/server/tacticonpluginfw/inc/tacticonpluginfwuids.hrh
--- a/tacticonserver/server/tacticonpluginfw/inc/tacticonpluginfwuids.hrh	Fri Feb 19 23:06:54 2010 +0200
+++ b/tacticonserver/server/tacticonpluginfw/inc/tacticonpluginfwuids.hrh	Fri Mar 12 15:43:50 2010 +0200
@@ -16,4 +16,5 @@
 */
 
 
-#define ETacticonPlayerIFUID 0x2001FE50
\ No newline at end of file
+#define ETacticonPlayerIFUID 0x2001FE50
+
diff -r 0a5ec9af4050 -r e0d1d1629961 tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/data/2001FE52.rss
--- a/tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/data/2001FE52.rss	Fri Feb 19 23:06:54 2010 +0200
+++ b/tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/data/2001FE52.rss	Fri Mar 12 15:43:50 2010 +0200
@@ -41,4 +41,6 @@
         };
     }
 
-// End of file
\ No newline at end of file
+// End of file
+
+
diff -r 0a5ec9af4050 -r e0d1d1629961 tactilefeedback/tactilefeedbackclient/src/touchfeedbackclient.cpp
--- a/tactilefeedback/tactilefeedbackclient/src/touchfeedbackclient.cpp	Fri Feb 19 23:06:54 2010 +0200
+++ b/tactilefeedback/tactilefeedbackclient/src/touchfeedbackclient.cpp	Fri Mar 12 15:43:50 2010 +0200
@@ -108,6 +108,10 @@
         {
         User::LeaveIfError( iChunk.OpenGlobal( data.iChunkName, EFalse ) );
         }
+    else if( err != KErrNone )
+        {
+        User::LeaveIfError( err );
+        }
     
     // #3 Set window count to zero
     TInt* chunkPtr = reinterpret_cast<TInt*>( iChunk.Base() );
@@ -121,6 +125,10 @@
         {
         User::LeaveIfError( iSemaphore.OpenGlobal( KTouchFeedbackSemaphore ) );
         }
+    else if( err != KErrNone )
+        {
+        User::LeaveIfError( err );
+        }
        
     // #5 Send chunk name to window server
     TPckgC<TTactileFeedbackConnectData> dataPkg ( data );
diff -r 0a5ec9af4050 -r e0d1d1629961 tactilefeedback/tactilefeedbackresolver/plugins/tactileaudioplugin/data/20021339.rss
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactileaudioplugin/data/20021339.rss	Fri Feb 19 23:06:54 2010 +0200
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactileaudioplugin/data/20021339.rss	Fri Mar 12 15:43:50 2010 +0200
@@ -42,4 +42,5 @@
         };
     }
 
-// End of file
\ No newline at end of file
+// End of file
+
diff -r 0a5ec9af4050 -r e0d1d1629961 tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/data/2001CB98.rss
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/data/2001CB98.rss	Fri Feb 19 23:06:54 2010 +0200
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/data/2001CB98.rss	Fri Mar 12 15:43:50 2010 +0200
@@ -42,4 +42,5 @@
         };
     }
 
-// End of file
\ No newline at end of file
+// End of file
+
diff -r 0a5ec9af4050 -r e0d1d1629961 tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/data/2001CB9C.rss
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/data/2001CB9C.rss	Fri Feb 19 23:06:54 2010 +0200
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/data/2001CB9C.rss	Fri Mar 12 15:43:50 2010 +0200
@@ -42,4 +42,5 @@
         };
     }
 
-// End of file
\ No newline at end of file
+// End of file
+
diff -r 0a5ec9af4050 -r e0d1d1629961 tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/data/2001CB9A.rss
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/data/2001CB9A.rss	Fri Feb 19 23:06:54 2010 +0200
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/data/2001CB9A.rss	Fri Mar 12 15:43:50 2010 +0200
@@ -42,4 +42,5 @@
         };
     }
 
-// End of file
\ No newline at end of file
+// End of file
+