--- a/homescreenapp/hsapplicationlauncher/src/hsapplicationlauncher.cpp	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/hsapplicationlauncher/src/hsapplicationlauncher.cpp	Wed Sep 15 17:32:31 2010 +0100
@@ -117,7 +117,7 @@
 //
 void CHsLaunch::ConstructL()
     {
-    iRepository = CRepository::NewL(TUid::Uid(0x2002b3aa));
+    // iRepository = CRepository::NewL(TUid::Uid(0x2002b3aa));
     
     iShutdownMonitor = CHsShutdownMonitor::NewL( *this );
     iShutdownMonitor->StartMonitor();
@@ -420,8 +420,8 @@
 //  
 TBool CHsLaunch::IsLanguageSelectedL()
     {
-    TInt value;
-    User::LeaveIfError(iRepository->Get(0x00000007, value));
+    TInt value = 1;  // yes?
+    // User::LeaveIfError(iRepository->Get(0x00000007, value));
     return value;
     }
 
@@ -432,9 +432,12 @@
 //  
 void CHsLaunch::StartListeningLanguageSelectionL()
     {
-    iCenRepNotifyHandler = CCenRepNotifyHandler::NewL(
+    if (iRepository)
+        {
+        iCenRepNotifyHandler = CCenRepNotifyHandler::NewL(
             *this, *iRepository, CCenRepNotifyHandler::EIntKey, 0x00000007);
-    iCenRepNotifyHandler->StartListeningL();
+        iCenRepNotifyHandler->StartListeningL();
+        }
     }
         
 // -----------------------------------------------------------------------------
@@ -444,9 +447,12 @@
 //      
 void CHsLaunch::StopListeningLanguageSelection()
     {
-    iCenRepNotifyHandler->StopListening();
-    delete iCenRepNotifyHandler;
-    iCenRepNotifyHandler = NULL;
+    if (iCenRepNotifyHandler)
+        {
+        iCenRepNotifyHandler->StopListening();
+        delete iCenRepNotifyHandler;
+        iCenRepNotifyHandler = NULL;
+        }
     }
 
 // End of File