--- a/camerauis/cameraapp/generic/src/CamCaptureSetupViewBase.cpp	Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamCaptureSetupViewBase.cpp	Wed Oct 13 14:09:54 2010 +0300
@@ -68,12 +68,6 @@
       delete iInfoListBoxContainer;
       }        
     }
-
-  
-  if( iCaptureSetupControlHandler )
-      {
-      delete iCaptureSetupControlHandler;
-      }
   PRINT( _L("Camera <= ~CCamCaptureSetupViewBase") );
   }
 
@@ -559,7 +553,7 @@
     CCamAppUiBase* appUi = static_cast<CCamAppUiBase*>( AppUi() );
 
     TRect rect = appUi->ApplicationRect();
-    if ( !AknLayoutUtils::PenEnabled() ) 
+    if ( !CamUtility::IsNhdDevice() ) 
         {
         // Space for visible statuspane for non-touch device
         AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, rect );