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
This commit is contained in:
gewlitys
2008-09-03 17:58:12 +00:00
parent c16423c4b5
commit 86295bff30
+6 -7
View File
@@ -7,6 +7,7 @@
#include <eikstart.h> #include <eikstart.h>
#include <badesca.h> #include <badesca.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
const TUid KUidSdlApp={ 0xA000A0C3 }; const TUid KUidSdlApp={ 0xA000A0C3 };
@@ -144,18 +145,17 @@ void CSdlAppUi::ConstructL()
iSDLWin = new (ELeave) CSDLWin; iSDLWin = new (ELeave) CSDLWin;
iSDLWin->ConstructL(ApplicationRect()); iSDLWin->ConstructL(ApplicationRect());
iWait = new (ELeave) CExitWait(*this); iSdl = CSDL::NewL(CSDL::EEnableFocusStop);
iSdl = CSDL::NewL(CSDL::ENoFlags);
iSdlObserver = new (ELeave) CSDLObserver; iSdlObserver = new (ELeave) CSDLObserver;
iSdl->SetContainerWindowL( iSdl->SetContainerWindowL(
iSDLWin->GetWindow(), iSDLWin->GetWindow(),
iEikonEnv->WsSession(), iEikonEnv->WsSession(),
*iEikonEnv->ScreenDevice()); *iEikonEnv->ScreenDevice());
iSdl->SetObserver(iSdlObserver); iSdl->SetObserver(iSdlObserver);
iSdl->DisableKeyBlocking(*this);
iWait = new (ELeave) CExitWait(*this);
CDesC8ArrayFlat* args = new (ELeave)CDesC8ArrayFlat(10); CDesC8ArrayFlat* args = new (ELeave)CDesC8ArrayFlat(10);
iSdl->CallMainL(iWait->iStatus, *args, 75000); iSdl->CallMainL(iWait->iStatus, *args, 75000);
delete args; delete args;
@@ -170,10 +170,9 @@ void CSdlAppUi::HandleCommandL(TInt aCommand)
case EAknCmdExit: case EAknCmdExit:
case EAknSoftkeyExit: case EAknSoftkeyExit:
case EEikCmdExit: case EEikCmdExit:
iExit = ETrue; exit(0);
if(iWait == NULL || !iWait->IsActive())
Exit();
break; break;
default: default:
break; break;
} }