--- a/appinstaller/AppinstUi/sisxsifplugin/src/sisxsifpluginactiveimpl.cpp Fri Aug 20 11:39:56 2010 +0300
+++ b/appinstaller/AppinstUi/sisxsifplugin/src/sisxsifpluginactiveimpl.cpp Fri Sep 03 17:01:40 2010 +0300
@@ -104,13 +104,14 @@
if( iClientStatus )
{
+ if( iUiHandler )
+ {
+ iUiHandler->CancelDialogs();
+ }
if( iAsyncLauncher )
{
iAsyncLauncher->CancelOperation();
- delete iAsyncLauncher;
- iAsyncLauncher = NULL;
}
-
CompleteClientRequest( KErrCancel );
}
}
@@ -544,7 +545,6 @@
User::RequestComplete( iClientStatus, aResult );
iClientStatus = NULL;
}
- __ASSERT_DEBUG( !IsActive(), Panic( ESisxSifInternalError ) );
iOperation = ENoOperation;
iPhase = ENotActive;
}
@@ -637,7 +637,7 @@
TUid uid;
CComponentEntry *entry = CComponentEntry::NewLC();
GetComponentAndUidL( aComponentId, *entry, uid );
- iUiHandler->PublishStartL( *entry );
+ iUiHandler->PublishStartL( *entry, EUninstalling );
CleanupStack::PopAndDestroy( entry );
iAsyncLauncher->UninstallL( *iUiHandler, uid, iStatus );
@@ -896,7 +896,7 @@
TInt maxInstalledSize = rootNode.MaxInstalledSize();
iUiHandler->SetMaxInstalledSize( maxInstalledSize );
- iUiHandler->PublishStartL( rootNode );
+ iUiHandler->PublishStartL( rootNode, EInstalling );
UpdateInstallPrefsForPerformingOcspL();
FillDeviceSupportedLanguagesL();