mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Destroy context in TileElementWantsFootpathConnection::TearDownTestCase 

Not destroying the context might upset some compilers due to the order
of destruction of variables the context might still require.
This commit is contained in:
Michał Janiszewski 2018-04-21 23:03:03 +02:00 committed by Ted John
parent 466c465d44
commit 090c444353
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/tests/TileElements.cpp
View File

@ -28,6 +28,22 @@ protected:
SUCCEED();
}
static void TearDownTestCase()
{
// FIXME: If this is not reset here, the context will outlive
// _availableObjectStringIds from Language.cpp, but upon its destruction
// OpenRCT2::Context::~Context() ../src/openrct2/Context.cpp:135
// object_manager_unload_all_objects() ../src/openrct2/object/ObjectManager.cpp:620
// ObjectManager::UnloadAll() ../src/openrct2/object/ObjectManager.cpp:207
// ObjectManager::UnloadObject(Object*) ../src/openrct2/object/ObjectManager.cpp:329
// RideObject::Unload() ../src/openrct2/object/RideObject.cpp:334
// language_free_object_string(unsigned short) ../src/openrct2/localisation/Language.cpp:274
// wants to access _availableObjectStringIds, which is already gone.
//
// This hack evicts context and ensures _availableObjectStringIds is
// available for the time we want to use it, until a better solution is implemented.
_context.reset();
}
private:
static std::shared_ptr<IContext> _context;
};