Move resourcemanager from class to namespace.

2 files changed, 20 insertions, 3 deletions

diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc
index 6064dfd72..e86aa6b0e 100644
--- a/src/gui/widgets/browserbox_unittest.cc
+++ b/src/gui/widgets/browserbox_unittest.cc
@@ -47,11 +47,19 @@
 
 extern const char *dirSeparator;
 
+TEST_CASE("BrowserBox leak test1")
+{
+    logger = new Logger();
+    REQUIRE(gui == nullptr);
+    ResourceManager::cleanOrphans(true);
+    ResourceManager::deleteInstance();
+    delete2(logger);
+}
+
 TEST_CASE("BrowserBox tests", "browserbox")
 {
     client = new Client;
     logger = new Logger();
-    ResourceManager::init();
     VirtFs::mountDirSilent("data", Append_false);
     VirtFs::mountDirSilent("../data", Append_false);
 
@@ -189,3 +197,12 @@ TEST_CASE("BrowserBox tests", "browserbox")
     delete2(logger);
 //    VirtFs::deinit();
 }
+
+TEST_CASE("BrowserBox leak test2")
+{
+    logger = new Logger();
+    REQUIRE(gui == nullptr);
+    ResourceManager::cleanOrphans(true);
+    ResourceManager::deleteInstance();
+    delete2(logger);
+}
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 4aeea03b5..83d5bd58e 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -182,7 +182,7 @@ void Desktop::setBestFittingWallpaper()
     {
         if (mWallpaper)
         {
-            resourceManager->decRefDelete(mWallpaper);
+            ResourceManager::decRefDelete(mWallpaper);
             mWallpaper = nullptr;
         }
 
@@ -200,7 +200,7 @@ void Desktop::setBestFittingWallpaper()
 
             if (newRsclWlPpr)
             {
-                resourceManager->decRefDelete(nWallPaper);
+                ResourceManager::decRefDelete(nWallPaper);
                 // We replace the resource in the resource manager
                 mWallpaper = newRsclWlPpr;
             }