diff -r bdf78597b41c -r 6c92a12abac0 videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/VCXTestMessageWait.cpp
--- a/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/VCXTestMessageWait.cpp	Tue Jan 26 12:55:56 2010 +0200
+++ b/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/VCXTestMessageWait.cpp	Fri Mar 19 09:48:59 2010 +0200
@@ -205,8 +205,6 @@
         }
     else
         {
-        iWaitStarted = EFalse;
-        
         // Nothing to wait for.
         iTimeoutTimer->CancelTimer();
         
@@ -247,17 +245,10 @@
 //
 EXPORT_C void CVCXTestMessageWait::ReceiveMessage( TInt32 aMsg, TInt aError )
 	{
-    if( !iWaitStarted )
-        {
-        VCXLOGLO1("CVCXTestMessageWait::ReceiveMessage: Wait not active.");
-        return;
-        }
-
     VCXLOGLO1(">>>CVCXTestMessageWait::ReceiveMessage");
 
     if( aError != KErrNone )
         {
-        iWaitStarted = EFalse;
         if( iActiveWaitBlocking->IsWaiting() )
             {
             iError = aError;
@@ -300,7 +291,6 @@
         
         if( iWaitedMessages.Count() <= 0 )
             {
-            iWaitStarted = EFalse;
             // Stop wait.
             if( iActiveWaitBlocking->IsWaiting() )
                 {
@@ -337,7 +327,6 @@
         else
         if( iWaitedMessages.Count() > 0 )
             {
-            iWaitStarted = EFalse;
             VCXLOGLO2("CVCXTestMessageWait:: Timeout. Messages left: %d", iWaitedMessages.Count());
             if( iActiveWaitBlocking->IsWaiting() )
                 {