diff -r 7eb70891911c -r a2467631ae02 convergedcallengine/cce/src/cccepluginmanager.cpp --- a/convergedcallengine/cce/src/cccepluginmanager.cpp Fri Jun 11 14:07:16 2010 +0300 +++ b/convergedcallengine/cce/src/cccepluginmanager.cpp Wed Jun 23 18:49:32 2010 +0300 @@ -471,7 +471,7 @@ else if( iAlternativeEmergencyPlugins.Find( aUid ) == KErrNotFound ) { CCELOGSTRING("CCCEPluginManager::AddToAlternativeEmergencyArray: New plugin. Append to array "); - iAlternativeEmergencyPlugins.Append( aUid ); + iAlternativeEmergencyPlugins.Append( aUid ); // return value ignored.. } else { @@ -609,12 +609,16 @@ { CCCEPlugin* plugin( NULL ); - for( TInt i=0; iType().iUid == aImplementationUid.iUid ) { plugin = iPluginArray[i]; - i = iPluginArray.Count(); + i = count; } } @@ -656,14 +660,16 @@ { if ( iPluginArray[a]->Type() == aPluginId ) { - iPluginsToClose.Append(iPluginArray[a]); - if (!iIdle->IsActive()) - { - iIdle->Start( TCallBack(RemovePlugins,this) ); + if( KErrNone == iPluginsToClose.Append(iPluginArray[a])) + { + if (!iIdle->IsActive()) + { + iIdle->Start( TCallBack(RemovePlugins,this) ); + } + iPluginArray.Remove(a); + iPluginArray.Compress(); + return; } - iPluginArray.Remove(a); - iPluginArray.Compress(); - return; } } } @@ -688,14 +694,16 @@ { if ( iPluginArray[a]->Type() == aPluginUid ) { - iPluginsToClose.Append(iPluginArray[a]); - if (!iIdle->IsActive()) - { - iIdle->Start( TCallBack(RemovePlugins,this) ); + if( KErrNone == iPluginsToClose.Append(iPluginArray[a])) + { + if (!iIdle->IsActive()) + { + iIdle->Start( TCallBack(RemovePlugins,this) ); + } + iPluginArray.Remove(a); + iPluginArray.Compress(); + return; } - iPluginArray.Remove(a); - iPluginArray.Compress(); - return; } } }