diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-02 16:54:06 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-02 16:54:06 +0300 |
| commit | 40b35b5a049187c1911075c474086251d639d127 (patch) | |
| tree | c3c3dc430d9ae2017b85f4c6ca835f2e432c0d9d /src/gui | |
| parent | db08f7874bd9be0e461b296569613364353d4eaf (diff) | |
| download | manaplus-40b35b5a049187c1911075c474086251d639d127.tar.gz manaplus-40b35b5a049187c1911075c474086251d639d127.tar.bz2 manaplus-40b35b5a049187c1911075c474086251d639d127.tar.xz manaplus-40b35b5a049187c1911075c474086251d639d127.zip | |
Revert "Fix tests failure in physfs deinit."
This reverts commit 22a2c48a263c67ab3418c22a88cec67e5c1d318c.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/browserbox_unittest.cc | 2 | ||||
| -rw-r--r-- | src/gui/windowmanager_unittest.cc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc index c4810a188..0dd8af585 100644 --- a/src/gui/widgets/browserbox_unittest.cc +++ b/src/gui/widgets/browserbox_unittest.cc @@ -174,9 +174,9 @@ TEST_CASE("BrowserBox tests", "browserbox") delete Widget::getGloablFont(); Widget::setGlobalFont(nullptr); delete box; + delete2(client); VirtFs::removeDirFromSearchPath("data"); VirtFs::removeDirFromSearchPath("../data"); - delete2(client); delete2(logger); // VirtFs::deinit(); } diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc index 638b2c5b6..38471370d 100644 --- a/src/gui/windowmanager_unittest.cc +++ b/src/gui/windowmanager_unittest.cc @@ -685,15 +685,15 @@ TEST_CASE("Windows tests", "windowmanager") delete2(localPlayer); delete2(userPalette); - VirtFs::removeDirFromSearchPath("data"); - VirtFs::removeDirFromSearchPath("../data"); - VirtFs::removeDirFromSearchPath("data/test"); - VirtFs::removeDirFromSearchPath("../data/test"); delete2(client); delete2(serverFeatures); delete2(inventoryHandler); delete2(charServerHandler); delete2(playerHandler); + VirtFs::removeDirFromSearchPath("data"); + VirtFs::removeDirFromSearchPath("../data"); + VirtFs::removeDirFromSearchPath("data/test"); + VirtFs::removeDirFromSearchPath("../data/test"); delete2(logger); // VirtFs::deinit(); |