diff -r 38e4cecf6e95 -r 8dd1c4fde3d7 skins/AknSkins/srvsrc/AknsSrv.cpp --- a/skins/AknSkins/srvsrc/AknsSrv.cpp Wed Jun 16 14:20:09 2010 +0100 +++ b/skins/AknSkins/srvsrc/AknsSrv.cpp Thu Jul 22 16:43:58 2010 +0100 @@ -100,25 +100,24 @@ aStartFailed = EFalse; CAknsSrv* server = new CAknsSrv(); - server->iMergeType = (TAknsSkinSrvMergeType)( - EAknsSkinSrvSkin | EAknsSkinSrvIdleWp ); - server->iBootFinished = EFalse; - if ( server ) - { - if ( server->Start( KAknSkinSrvName ) != KErrNone ) - { - AKNS_TRACE_ERROR("CAknsSrv::New START FAILED!"); - - aStartFailed = ETrue; - delete server; - return NULL; - } - } - else + if ( !server ) { AKNS_TRACE_ERROR("CAknsSrv::New SERVER ALLOCATION FAILED!"); return NULL; } + + server->iMergeType = (TAknsSkinSrvMergeType)( + EAknsSkinSrvSkin | EAknsSkinSrvIdleWp ); + server->iBootFinished = EFalse; + if (server->Start(KAknSkinSrvName) != KErrNone) + { + AKNS_TRACE_ERROR("CAknsSrv::New START FAILED!"); + + aStartFailed = ETrue; + delete server; + return NULL; + } + server->iBitmapStore = new CAknsSrvBitmapStore; if( !server->iBitmapStore ) {