--- a/memspy/Engine/Source/MemSpyEngineImp.cpp	Fri May 14 17:25:03 2010 +0300
+++ b/memspy/Engine/Source/MemSpyEngineImp.cpp	Thu May 27 14:26:55 2010 +0300
@@ -127,7 +127,7 @@
     }
 
 
-void CMemSpyEngineImp::ConstructL()
+void CMemSpyEngineImp::ConstructL( TBool aStartServer )
     {
 #ifdef _DEBUG
     RDebug::Printf( "CMemSpyEngineImp::ConstructL() - START" );
@@ -138,8 +138,11 @@
     // Starting the server before the driver connection is made
     // ensures that only one instance of MemSpy can run (either the S60
     // UI or the console UI ).
-    // DONE: MK: Removing server from engine. iServer = CMemSpyEngineServer::NewL( iEngine );
-    //
+    if (aStartServer)
+    	{
+		iServer = CMemSpyEngineServer::NewL( iEngine );
+    	}
+    
     iMemSpyDriver = new(ELeave) RMemSpyDriverClient();
     const TInt error = Driver().Open();
     User::LeaveIfError( error );