diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-08 17:47:29 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-08 17:47:54 +0300 |
| commit | 98e4b160bdb944913b014d83d61cb4c0b23817d7 (patch) | |
| tree | 03a937e5afee73d3621cdc7fbacf772fe33e25a0 | |
| parent | 759ea19bab7125dd6256caf2a2d37f4d7df0ce4b (diff) | |
| download | manaplus-98e4b160bdb944913b014d83d61cb4c0b23817d7.tar.gz manaplus-98e4b160bdb944913b014d83d61cb4c0b23817d7.tar.bz2 manaplus-98e4b160bdb944913b014d83d61cb4c0b23817d7.tar.xz manaplus-98e4b160bdb944913b014d83d61cb4c0b23817d7.zip | |
Add some cleanups into windows unit tests.
| -rw-r--r-- | src/gui/windowmanager_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
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"); |