Changes: Themedaemon should not abort when theme ids changed

RevBy: Jörgen, Fabian

Changes:
When a theme id is changed the themedaemon cannot preload the
id anymore. Right now it is aborting in this case and one has to
manually clear the preload list. Instead of this unknown elements
are ignored and deleted from the preload list.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/corelib/theme/mcommonpixmaps.cpp b/src/corelib/theme/mcommonpixmaps.cpp
index b2e9aa17..f77c9ce1 100644
--- a/src/corelib/theme/mcommonpixmaps.cpp
+++ b/src/corelib/theme/mcommonpixmaps.cpp
@@ -171,8 +171,11 @@ void MCommonPixmaps::loadOne()
         ImageResource *resource = daemon->findImageResource(id.imageId);
         if (resource)
             resource->fetchPixmap(id.size);
-        else
-            qFatal("MCommonPixmaps - Theme daemon could not find resource %s while loading most used pixmaps! Please re-install current theme or clear the preload.list file", qPrintable(id.imageId));
+        else {
+            mWarning("MCommonPixmaps - Themedaemon could not find resource %s while loading most used pixmaps. Removing from list.", qPrintable(id.imageId));
+            requestCounts.remove(id);
+            mostUsedPixmaps.remove(id);
+        }
 
     } else {
         // the cpu usage was too high, so start start the timer with longer delay