--- a/windowing/windowserver/nga/SERVER/SERVER.CPP	Tue Apr 20 16:38:10 2010 +0100
+++ b/windowing/windowserver/nga/SERVER/SERVER.CPP	Fri Apr 23 14:57:14 2010 +0100
@@ -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)