phoneengine/callhandling/src/cpecallhandling.cpp
changeset 65 2a5d4ab426d3
parent 46 bc5a64e5bc3c
child 74 d1c62c765e48
--- a/phoneengine/callhandling/src/cpecallhandling.cpp	Mon Aug 23 15:42:12 2010 +0300
+++ b/phoneengine/callhandling/src/cpecallhandling.cpp	Fri Sep 03 13:33:36 2010 +0300
@@ -1678,9 +1678,13 @@
     TInt callIndex;
     CPESingleCall* callData;
     TInt errorCode( ECCPErrorNotFound );
+    TBool onlyConferenceCall( ( iConferenceCall && 
+            ( iConferenceCall->EnumerateCalls() == GetNumberOfCalls()) ));
 
     if ( ( iConferenceCall ) && 
-         ( iConferenceCall->GetCallState() == EPEStateConnectedConference ) )
+         ( iConferenceCall->GetCallState() == EPEStateConnectedConference ||
+           (iConferenceCall->GetCallState() == EPEStateHeldConference &&
+            onlyConferenceCall ) ) )
         {
         errorCode = iConferenceCall->Swap();
         }