--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamcorderPlugin.cpp	Thu Jan 07 16:18:56 2010 +0200
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamcorderPlugin.cpp	Mon Jan 18 20:06:55 2010 +0200
@@ -535,7 +535,23 @@
     {
     if ( LaunchedFromGS() )
         {
-        return iSettingsModel->IntegerSettingValue( aSettingItem );
+        TInt settingValue = iSettingsModel->IntegerSettingValue( aSettingItem );
+
+        if (  ( ECamSettingItemPhotoMediaStorage == aSettingItem || 
+                ECamSettingItemVideoMediaStorage == aSettingItem ) && 
+              ( settingValue == ECamMediaStorageCard ) &&
+              ( CamUtility::MemoryCardStatus() != ECamMemoryCardInserted ) )
+          {
+          if ( CamUtility::MassMemoryDrive() > 0 )
+              {
+              settingValue = ECamMediaStorageMassStorage;
+              }
+          else
+              {
+              settingValue = ECamMediaStoragePhone;
+              }
+          }
+        return settingValue;
         }
     else
         {