From 520b6bbc44cf86dd0a761379e7002d850c7c0079 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 17 Jan 2014 22:45:02 +0300
Subject: fix crash on window resize.

---
 src/gui/widgets/desktop.cpp       |  4 ++--
 src/resources/resourcemanager.cpp | 31 +++++++++++++++++++++++++++++++
 src/resources/resourcemanager.h   |  2 ++
 3 files changed, 35 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 2be86f615..32c8a4988 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -162,7 +162,7 @@ void Desktop::setBestFittingWallpaper()
         ResourceManager *const resman = ResourceManager::getInstance();
         if (mWallpaper)
         {
-            resman->moveToDeleted(mWallpaper);
+            resman->decRefDelete(mWallpaper);
             mWallpaper = nullptr;
         }
 
@@ -180,7 +180,7 @@ void Desktop::setBestFittingWallpaper()
 
             if (newRsclWlPpr)
             {
-                resman->moveToDeleted(nWallPaper);
+                resman->decRefDelete(nWallPaper);
                 // We replace the resource in the resource manager
                 mWallpaper = newRsclWlPpr;
             }
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 00fe37c75..fa0717622 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -887,6 +887,37 @@ void ResourceManager::moveToDeleted(Resource *const res)
     }
 }
 
+void ResourceManager::decRefDelete(Resource *const res)
+{
+    if (!res)
+        return;
+
+    bool found(false);
+    const int count = res->getRefCount();
+    if (count == 1)
+    {
+        logResource(res);
+
+        ResourceIterator resIter = mResources.find(res->mIdPath);
+        if (resIter != mResources.end() && resIter->second == res)
+        {
+            mResources.erase(resIter);
+        }
+        else
+        {
+            resIter = mOrphanedResources.find(res->mIdPath);
+            if (resIter != mOrphanedResources.end() && resIter->second == res)
+                mOrphanedResources.erase(resIter);
+        }
+
+        delete res;
+    }
+    else
+    {
+        res->decRef();
+    }
+}
+
 ResourceManager *ResourceManager::getInstance()
 {
     // Create a new instance if necessary.
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 83c0036f2..72cad5988 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -240,6 +240,8 @@ class ResourceManager final
 
         void clearDeleted(const bool full = true);
 
+        void decRefDelete(Resource *const res);
+
         static void logResource(const Resource *const res);
 
         /**
-- 
cgit v1.2.3-70-g09d2