maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix memory leak, use unique_ptr for Core::Terminal object (#914)

Browse source
This commit is contained in:
Dreamer 2019-05-22 00:07:03 +03:00 committed by adiviness
parent 8da6737d64
commit db637021fd
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cascadia/TerminalControl/TermControl.cpp
View file

@ -278,14 +278,14 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
const auto windowWidth = _swapChainPanel.ActualWidth(); // Width() and Height() are NaN?
const auto windowHeight = _swapChainPanel.ActualHeight();
_terminal = new ::Microsoft::Terminal::Core::Terminal();
_terminal = std::make_unique<::Microsoft::Terminal::Core::Terminal>();
// First create the render thread.
auto renderThread = std::make_unique<::Microsoft::Console::Render::RenderThread>();
// Stash a local pointer to the render thread, so we can enable it after
// we hand off ownership to the renderer.
auto* const localPointerToThread = renderThread.get();
_renderer = std::make_unique<::Microsoft::Console::Render::Renderer>(_terminal, nullptr, 0, std::move(renderThread));
_renderer = std::make_unique<::Microsoft::Console::Render::Renderer>(_terminal.get(), nullptr, 0, std::move(renderThread));
::Microsoft::Console::Render::IRenderTarget& renderTarget = *_renderer;
// Set up the DX Engine

2
src/cascadia/TerminalControl/TermControl.h
View file

@ -69,7 +69,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
Windows::UI::Xaml::Controls::Primitives::ScrollBar _scrollBar;
event_token _connectionOutputEventToken;
::Microsoft::Terminal::Core::Terminal* _terminal;
std::unique_ptr<::Microsoft::Terminal::Core::Terminal> _terminal;
std::unique_ptr<::Microsoft::Console::Render::Renderer> _renderer;
std::unique_ptr<::Microsoft::Console::Render::DxEngine> _renderEngine;