From 40b35b5a049187c1911075c474086251d639d127 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 2 Mar 2017 16:54:06 +0300
Subject: Revert "Fix tests failure in physfs deinit."

This reverts commit 22a2c48a263c67ab3418c22a88cec67e5c1d318c.
---
 src/resources/dye/dye_unittest.cc                         | 2 +-
 src/resources/dye/dyepalette_unittest.cc                  | 2 +-
 src/resources/map/speciallayer_unittest.cc                | 2 +-
 src/resources/resourcemanager/resourcemanager_unittest.cc | 2 +-
 src/resources/sprite/animatedsprite_unittest.cc           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/resources')

diff --git a/src/resources/dye/dye_unittest.cc b/src/resources/dye/dye_unittest.cc
index 6b2e01e60..cc368d865 100644
--- a/src/resources/dye/dye_unittest.cc
+++ b/src/resources/dye/dye_unittest.cc
@@ -2393,11 +2393,11 @@ TEST_CASE("Dye real dye")
     {
         dyeCheck("|A:#0000FFFF,FF000050", "arrow_up_A.png");
     }
+    delete2(client);
     VirtFs::removeDirFromSearchPath("data");
     VirtFs::removeDirFromSearchPath("../data");
     VirtFs::removeDirFromSearchPath("data/test");
     VirtFs::removeDirFromSearchPath("../data/test");
-    delete2(client);
     delete2(logger);
 //    VirtFs::deinit();
 }
diff --git a/src/resources/dye/dyepalette_unittest.cc b/src/resources/dye/dyepalette_unittest.cc
index 3fdcfb1ff..7df69e952 100644
--- a/src/resources/dye/dyepalette_unittest.cc
+++ b/src/resources/dye/dyepalette_unittest.cc
@@ -383,11 +383,11 @@ TEST_CASE("DyePalette tests")
         REQUIRE(palette.mColors[0].value[2] == 46);
         REQUIRE(palette.mColors[0].value[3] == 0x77);
     }
+    delete2(client);
     VirtFs::removeDirFromSearchPath("data");
     VirtFs::removeDirFromSearchPath("../data");
     VirtFs::removeDirFromSearchPath("data/test");
     VirtFs::removeDirFromSearchPath("../data/test");
-    delete2(client);
     delete2(logger);
 //    VirtFs::deinit();
 }
diff --git a/src/resources/map/speciallayer_unittest.cc b/src/resources/map/speciallayer_unittest.cc
index a38adbd96..223d05b4e 100644
--- a/src/resources/map/speciallayer_unittest.cc
+++ b/src/resources/map/speciallayer_unittest.cc
@@ -261,8 +261,8 @@ TEST_CASE("SpecialLayer updateCache")
 
     delete layer;
     resourceManager->cleanOrphans();
+    delete2(client);
     VirtFs::removeDirFromSearchPath("data");
     VirtFs::removeDirFromSearchPath("../data");
-    delete2(client);
     delete2(logger);
 }
diff --git a/src/resources/resourcemanager/resourcemanager_unittest.cc b/src/resources/resourcemanager/resourcemanager_unittest.cc
index ec3ac01d1..fa0a07b76 100644
--- a/src/resources/resourcemanager/resourcemanager_unittest.cc
+++ b/src/resources/resourcemanager/resourcemanager_unittest.cc
@@ -659,9 +659,9 @@ TEST_CASE("resourcemanager", "resourcemanager")
 
     delete resourceManager;
     resourceManager = safeResman;
+    delete2(client);
     VirtFs::removeDirFromSearchPath("data");
     VirtFs::removeDirFromSearchPath("../data");
-    delete2(client);
     delete2(logger);
 //    VirtFs::deinit();
 }
diff --git a/src/resources/sprite/animatedsprite_unittest.cc b/src/resources/sprite/animatedsprite_unittest.cc
index 604ae264f..85a1c3e87 100644
--- a/src/resources/sprite/animatedsprite_unittest.cc
+++ b/src/resources/sprite/animatedsprite_unittest.cc
@@ -181,9 +181,9 @@ TEST_CASE("AnimatedSprite tests", "animatedsprite")
         delete sprite2;
     }
 
+    delete2(client);
     VirtFs::removeDirFromSearchPath("data");
     VirtFs::removeDirFromSearchPath("../data");
-    delete2(client);
     delete2(logger);
 //    VirtFs::deinit();
 }
-- 
cgit v1.2.3-70-g09d2