--- a/callcontinuity/vcchotrigger/src/vcchotrigger.cpp	Wed Sep 15 12:01:56 2010 +0300
+++ b/callcontinuity/vcchotrigger/src/vcchotrigger.cpp	Wed Oct 13 14:20:32 2010 +0300
@@ -349,10 +349,8 @@
     TVccHoStatus hoStatus( EVccHoStateUnknown );
     iEngPsProperty->GetCurrentHoStatus( hoStatus );
     
-    RUBY_DEBUG1( " hoStatus = %d ", hoStatus );
-    
-    if( hoStatus != EVccCsToPsHoStarted && hoStatus != EVccCsToPsHoInprogress 
-        && hoStatus != EVccPsToCsHoStarted && hoStatus != EVccPsToCsHoInprogress )
+    if( hoStatus != EVccCsToPsHoStarted || hoStatus != EVccCsToPsHoInprogress 
+        || hoStatus != EVccPsToCsHoStarted || hoStatus != EVccPsToCsHoInprogress )
         {
         RUBY_DEBUG0( "HO not in progress,  updating keys" );
         TRAP_IGNORE( UpdatePsKeysL() );
@@ -366,11 +364,12 @@
     RUBY_DEBUG1( " -DoHoInHeldWaitingCalls=%x ", iPolicy.DoHoInHeldWaitingCalls() );  
     RUBY_DEBUG0( "0 = GOOD, 1 = WEAK, 2 = UNDEFINED" );
     
-    // If the new one is the same with the previous class and not weak, do nothing. 
-    // Otherwise, the ho will be triggered.
-    if ( iPreviousGsmClass == iGsmClass && iGsmClass != ESignalClassWeak  )
+    // If the previous class is the same as the new one
+    // - do nothing.
+    
+    if ( iPreviousGsmClass == iGsmClass && iWlanClass != ESignalClassWeak  )
         {
-        RUBY_DEBUG0( "No change in GSM signal class and it is not weak  -> return" );
+        RUBY_DEBUG0( "No change in GSM signal class -> return" );
     
         return;
         }