mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[client,sdl] keep SDL_RWops open

Browse Source 
the application crashes if we close the SDL_RWops after opening the
font. keep it open until the widget is destroyed
This commit is contained in:
akallabeth 2023-10-10 22:35:52 +02:00 committed by akallabeth
parent 33c1183fe1
commit c7b123076a
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/SDL/dialogs/sdl_widget.cpp
View File

@ -42,21 +42,23 @@ SdlWidget::SdlWidget(SDL_Renderer* renderer, const SDL_Rect& rect, bool input)
{
assert(renderer);
auto ops = SDL_RWFromConstMem(font_buffer.data(), static_cast<int>(font_buffer.size()));
if (ops)
_font = TTF_OpenFontRW(ops, 0, 64);
SDL_RWclose(ops);
_ops = SDL_RWFromConstMem(font_buffer.data(), static_cast<int>(font_buffer.size()));
if (_ops)
_font = TTF_OpenFontRW(_ops, 0, 64);
}
SdlWidget::SdlWidget(SdlWidget&& other) noexcept
: _font(std::move(other._font)), _rect(std::move(other._rect))
: _font(std::move(other._font)), _ops(other._ops), _rect(std::move(other._rect))
{
other._font = nullptr;
other._ops = nullptr;
}
SdlWidget::~SdlWidget()
{
TTF_CloseFont(_font);
if (_ops)
SDL_RWclose(_ops);
}
bool SdlWidget::error_ex(Uint32 res, const char* what, const char* file, size_t line,

1
client/SDL/dialogs/sdl_widget.hpp
View File

@ -72,6 +72,7 @@ class SdlWidget
private:
TTF_Font* _font;
SDL_RWops* _ops;
SDL_Rect _rect;
bool _input;
};