From 164d3de4329019d34b10a802be16ea35aaafc5da Mon Sep 17 00:00:00 2001
From: Alessandro Portale <aportale@trolltech.com>
Date: Wed, 20 May 2009 16:32:33 +0200
Subject: Fixes

---
 src/gui/styles/qs60style_simulated.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gui/styles/qs60style_simulated.cpp b/src/gui/styles/qs60style_simulated.cpp
index 5a88f9a..f10da2b 100644
--- a/src/gui/styles/qs60style_simulated.cpp
+++ b/src/gui/styles/qs60style_simulated.cpp
@@ -204,7 +204,8 @@ QPixmap QS60StylePrivate::backgroundTexture()
 
     if (!m_backgroundValid) {
         result = QPixmap();
-        result = part(QS60StyleEnums::SP_QsnBgScreen, QApplication::activeWindow()->size());
+        const QSize size = QApplication::activeWindow()?QApplication::activeWindow()->size():QSize(100, 100);
+        result = part(QS60StyleEnums::SP_QsnBgScreen, size);
         m_backgroundValid = true;
     }
     return result;
@@ -285,8 +286,10 @@ QStringList QS60Style::colorListKeys()
 void QS60Style::setS60Theme(const QHash<QString, QPicture> &parts,
     const QHash<QPair<QString , int>, QColor> &colors)
 {
+    Q_D(QS60Style);
     QS60StyleModeSpecifics::m_partPictures = parts;
     QS60StyleModeSpecifics::m_colors = colors;
+    d->clearCaches();
 }
 
 QT_END_NAMESPACE
-- 
cgit v0.12