equal
deleted
inserted
replaced
278 } |
278 } |
279 else |
279 else |
280 { |
280 { |
281 iconStr = aIconStr.Alloc(); |
281 iconStr = aIconStr.Alloc(); |
282 } |
282 } |
|
283 |
|
284 // nothing to do if no iconstr |
|
285 if ( !iconStr ){ return; } |
283 |
286 |
284 TSize size( iLogoSize ); |
287 TSize size( iLogoSize ); |
285 if ( iLogoImage ) { size = iLogoImage->SizeInPixels(); } |
288 if ( iLogoImage ) { size = iLogoImage->SizeInPixels(); } |
286 if ( size != iLogoSize && |
289 if ( size != iLogoSize && |
287 iLogoSize.iWidth > 0 && iLogoSize.iHeight > 0 ) |
290 iLogoSize.iWidth > 0 && iLogoSize.iHeight > 0 ) |
293 |
296 |
294 delete iconStr; |
297 delete iconStr; |
295 iconStr = NULL; |
298 iconStr = NULL; |
296 |
299 |
297 // handle result |
300 // handle result |
298 if ( KErrNone == err && IsPrepairingLogo() ) |
301 if ( KErrNone == err && iWait && |
|
302 IsPrepairingLogo() ) |
299 { |
303 { |
300 iWait->Start(); |
304 iWait->Start(); |
301 } |
305 } |
302 else if ( KErrNone != err && iFireLogoChanged ) |
306 else if ( KErrNone != err && iFireLogoChanged ) |
303 { |
307 { |