From 86295bff300eca8100a663c70f87a526f94abca3 Mon Sep 17 00:00:00 2001
From: gewlitys <gewlitys@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Wed, 3 Sep 2008 17:58:12 +0000
Subject: [PATCH] Exits now instantly when killed, other misc tweaking

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3069 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/symbian/uqmapp.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/sc2/src/symbian/uqmapp.cpp b/sc2/src/symbian/uqmapp.cpp
index d4aa9be4b..36737a5a6 100644
--- a/sc2/src/symbian/uqmapp.cpp
+++ b/sc2/src/symbian/uqmapp.cpp
@@ -7,6 +7,7 @@
 #include <eikstart.h>
 #include <badesca.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 const TUid KUidSdlApp={ 0xA000A0C3 };
 
@@ -143,19 +144,18 @@ void CSdlAppUi::ConstructL()
         
     iSDLWin = new (ELeave) CSDLWin;
     iSDLWin->ConstructL(ApplicationRect());
-            
-    iWait = new (ELeave) CExitWait(*this);
-    
-    iSdl = CSDL::NewL(CSDL::ENoFlags);
-    iSdlObserver = new (ELeave) CSDLObserver;
                 
+    iSdl = CSDL::NewL(CSDL::EEnableFocusStop);
+    iSdlObserver = new (ELeave) CSDLObserver;
+    
     iSdl->SetContainerWindowL(
                     iSDLWin->GetWindow(), 
                     iEikonEnv->WsSession(),
-                    *iEikonEnv->ScreenDevice());
-    
+                    *iEikonEnv->ScreenDevice());    
     iSdl->SetObserver(iSdlObserver);
+    iSdl->DisableKeyBlocking(*this);    
     
+    iWait = new (ELeave) CExitWait(*this);    
     CDesC8ArrayFlat* args = new (ELeave)CDesC8ArrayFlat(10);        
     iSdl->CallMainL(iWait->iStatus, *args, 75000);
     delete args;
@@ -170,17 +170,16 @@ void CSdlAppUi::HandleCommandL(TInt aCommand)
         case EAknCmdExit:
         case EAknSoftkeyExit:
         case EEikCmdExit:
-            iExit = ETrue;
-            if(iWait == NULL || !iWait->IsActive())
-                Exit(); 
+            exit(0);
             break;
+            
         default:
             break;
         }
     }
     
 void CSdlAppUi::DoExit(TInt aErr)
-    {
+    {    	
     delete iSdl;
     iSdl = NULL;