equal
deleted
inserted
replaced
1276 ( aSource != KVtEngProviderShareImage ) && |
1276 ( aSource != KVtEngProviderShareImage ) && |
1277 ( aSource == KVtEngProviderCam1 || |
1277 ( aSource == KVtEngProviderCam1 || |
1278 aSource == KVtEngProviderCam2 || |
1278 aSource == KVtEngProviderCam2 || |
1279 aSource == KVtEngProviderImage ) ) |
1279 aSource == KVtEngProviderImage ) ) |
1280 { |
1280 { |
1281 aSource = iDelayedSelect.DelayedSelectTarget(); |
1281 TVtEngProviderType delayedSelect( iDelayedSelect.DelayedSelectTarget() ); |
|
1282 if ( delayedSelect != KVtEngProviderNone && |
|
1283 delayedSelect != KVtEngProviderDefaultStillImage ) |
|
1284 { |
|
1285 aSource = delayedSelect; |
|
1286 } |
1282 } |
1287 } |
1283 |
1288 |
1284 if( IsProviderWaiting( aSource ) ) |
1289 if( IsProviderWaiting( aSource ) ) |
1285 { |
1290 { |
1286 // If waiting for provide switch and a provider initialization |
1291 // If waiting for provide switch and a provider initialization |