Resolve conflicts with master

[irrlicht.git] / examples / AutomatedTest / main.cpp

diff --git a/examples/AutomatedTest/main.cpp b/examples/AutomatedTest/main.cpp
index 6e9d646dd14d40496a8cef916c73e9bb1b930da3..96cbc7388b3c7bfac375574cd0b1689269232363 100644 (file)
--- a/examples/AutomatedTest/main.cpp
+++ b/examples/AutomatedTest/main.cpp
@@ -87,8 +87,12 @@ int main(int argc, char *argv[])
 \r
        const io::path mediaPath = getExampleMediaPath();\r
 \r
-       scene::IAnimatedMesh* mesh = smgr->getMesh(mediaPath + "coolguy_opt.x");\r
+       auto mesh_file = device->getFileSystem()->createAndOpenFile(mediaPath + "coolguy_opt.x");\r
+       check(mesh_file, "mesh file loading");\r
+       scene::IAnimatedMesh* mesh = smgr->getMesh(mesh_file);\r
        check(mesh, "mesh loading");\r
+       if (mesh_file)\r
+               mesh_file->drop();\r
        if (mesh)\r
        {\r
                video::ITexture* tex = driver->getTexture(mediaPath + "cooltexture.png");\r