# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1283451632 -10800
# Node ID a33bf25e6f725b91ebeea16a6d5d1faf1c7b7fd9
# Parent  3e2da88830cd0fe5b1979f61b2e490cc6b7c460a
Revision: 201033
Kit: 201035

diff -r 3e2da88830cd -r a33bf25e6f72 VERSION.SHA1
--- a/VERSION.SHA1	Wed Aug 18 10:37:55 2010 +0300
+++ b/VERSION.SHA1	Thu Sep 02 21:20:32 2010 +0300
@@ -1,1 +1,1 @@
-3d27fe288e4d8f0c989204751fae814d0131018f
+acc48564b55b8e2fbc80e7b93c790a44f4a7b6e3
diff -r 3e2da88830cd -r a33bf25e6f72 src/gui/kernel/qwidget_s60.cpp
--- a/src/gui/kernel/qwidget_s60.cpp	Wed Aug 18 10:37:55 2010 +0300
+++ b/src/gui/kernel/qwidget_s60.cpp	Thu Sep 02 21:20:32 2010 +0300
@@ -1225,7 +1225,8 @@
         // At this point the backing store should already be destroyed
         // so we flush the command buffer to ensure that the freeing of
         // those resources and deleting the window can happen "atomically"
-        S60->wsSession().Flush();
+        if (qApp)
+            S60->wsSession().Flush();
     }
 }