From 98e4b160bdb944913b014d83d61cb4c0b23817d7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 8 Mar 2017 17:47:29 +0300 Subject: Add some cleanups into windows unit tests. --- src/gui/windowmanager_unittest.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc index 871b23c84..a7b73c598 100644 --- a/src/gui/windowmanager_unittest.cc +++ b/src/gui/windowmanager_unittest.cc @@ -138,8 +138,7 @@ TEST_CASE("Windows tests", "windowmanager") XML::initXML(); SDL_Init(SDL_INIT_VIDEO); logger = new Logger(); - delete resourceManager; - resourceManager = nullptr; + ResourceManager::deleteInstance(); ResourceManager::init(); resourceManager->cleanOrphans(true); VirtFs::addDirToSearchPathSilent("data", Append_false); @@ -703,6 +702,8 @@ TEST_CASE("Windows tests", "windowmanager") delete2(inventoryHandler); delete2(charServerHandler); delete2(playerHandler); + delete2(gui); + ResourceManager::deleteInstance(); VirtFs::removeDirFromSearchPathSilent("data"); VirtFs::removeDirFromSearchPathSilent("../data"); VirtFs::removeDirFromSearchPathSilent("data/test"); -- cgit v1.2.3-60-g2f50