From ff9afda18d79babf9c40412a2a5dcc4938dc9ec2 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Sun, 17 Feb 2019 12:07:14 +0400 Subject: [PATCH] Avoid to keep reference to the local 'encoder' variable outside the Engine::go() --- apps/openmw/engine.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 15a8f0f32..cb106c711 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -258,6 +258,9 @@ OMW::Engine::~Engine() mViewer = nullptr; + delete mEncoder; + mEncoder = nullptr; + if (mWindow) { SDL_DestroyWindow(mWindow); @@ -657,8 +660,7 @@ void OMW::Engine::go() settingspath = loadSettings (settings); // Create encoder - ToUTF8::Utf8Encoder encoder (mEncoding); - mEncoder = &encoder; + mEncoder = new ToUTF8::Utf8Encoder(mEncoding); // Setup viewer mViewer = new osgViewer::Viewer;