convergedconnectionhandler/cchclientapi/src/cchuiapiimpl.cpp
branchRCL_3
changeset 9 bddb6d4447db
parent 2 7b872347d83b
--- a/convergedconnectionhandler/cchclientapi/src/cchuiapiimpl.cpp	Fri Mar 12 15:42:09 2010 +0200
+++ b/convergedconnectionhandler/cchclientapi/src/cchuiapiimpl.cpp	Mon Mar 15 12:39:55 2010 +0200
@@ -1142,9 +1142,10 @@
         }
     
     // Check that dialog showing is allowed.
-    __ASSERT_ALWAYS( StateIsAllowed( state ) || 
-            KCCHErrorInvalidSettings == aServiceStatus.Error(),
-        User::Leave( KErrNotSupported ) );
+    __ASSERT_ALWAYS( ( StateIsAllowed( state ) || 
+       KCCHErrorInvalidSettings == aServiceStatus.Error() ) &&
+       !iConnectionHandler->SearchWlanOngoing(),
+       User::Leave( KErrNotSupported ) );
     
     switch ( aServiceStatus.Error() )
         {