diff -r 15986eb6c500 -r 25f95128741d windowing/windowserver/nga/SERVER/SERVER.CPP
--- a/windowing/windowserver/nga/SERVER/SERVER.CPP	Wed Mar 31 23:34:07 2010 +0300
+++ b/windowing/windowserver/nga/SERVER/SERVER.CPP	Wed Apr 14 17:19:46 2010 +0300
@@ -951,6 +951,13 @@
 	return iDefaultAnimationScheduler;
 	}
 
+void CWindowServer::PrepareShutdown()
+	{
+	//Stop the renderloop, i.e. prevent any further calls to MWsAnimationScheduler::Animate() 
+	delete iDefaultAnimationScheduler;
+	iDefaultAnimationScheduler = NULL;
+	}
+
 TInt CWindowServer::RegisterEventHandler(CWsGraphicDrawer* aDrawer, MWsEventHandler* aHandler, TUint32 aEventMask)
 	{
 	if (!aDrawer || !aHandler || aEventMask==0)