diff -r 8c55c525d5d7 -r d486e5e3cc9a camerauis/cameraapp/generic/src/CamNaviProgressBarModel.cpp --- a/camerauis/cameraapp/generic/src/CamNaviProgressBarModel.cpp Mon Mar 15 12:39:00 2010 +0200 +++ b/camerauis/cameraapp/generic/src/CamNaviProgressBarModel.cpp Wed Mar 31 21:06:44 2010 +0300 @@ -344,21 +344,33 @@ CFbsBitmap* icon = NULL; CFbsBitmap* mask = NULL; - if ( iStorageLocation == ECamMediaStoragePhone ) - { - icon = iPhoneIcon; - mask = iPhoneIconMask; - } - else if ( iStorageLocation == ECamMediaStorageMassStorage ) - { - icon = iMassStorageIcon; - mask = iMassStorageIconMask; - } - else - { - icon = iMMCIcon; - mask = iMMCIconMask; - } + switch( iStorageLocation ) + { + case ECamMediaStoragePhone: + { + icon = iPhoneIcon; + mask = iPhoneIconMask; + } + break; + case ECamMediaStorageMassStorage: + { + icon = iMassStorageIcon; + mask = iMassStorageIconMask; + } + break; + case ECamMediaStorageCard: + { + icon = iMMCIcon; + mask = iMMCIconMask; + } + break; + case ECamMediaStorageNone: + default: + { + //TODO: Get icons when none is available + } + break; + } DrawElapsedTimeText( aGc ); DrawRemainingTimeText( aGc, skin );