Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some minor memory leaks in UIModeController, InputManager and Font.

Browse source
This commit is contained in:
Leon Styhre 2021-03-19 18:34:10 +01:00
parent adaec71f5b
commit 08e6f1b0dd
5 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
es-app/src/views/UIModeController.cpp
View file

@ -26,6 +26,14 @@ UIModeController* UIModeController::getInstance()
return sInstance;
}
void UIModeController::deinit()
{
if (sInstance) {
delete sInstance;
sInstance = nullptr;
}
}
UIModeController::UIModeController() : mPassKeyCounter(0)
{
mPassKeySequence = Settings::getInstance()->getString("UIMode_passkey");

1
es-app/src/views/UIModeController.h
View file

@ -23,6 +23,7 @@ class UIModeController
{
public:
static UIModeController* getInstance();
static void deinit();
// Monitor input for UI mode change, returns true (consumes input) when a UI mode
// change is triggered.

1
es-app/src/views/ViewController.cpp
View file

@ -83,6 +83,7 @@ ViewController::~ViewController()
{
assert(sInstance == this);
sInstance = nullptr;
UIModeController::deinit();
}
void ViewController::noSystemsFileDialog()

5
es-core/src/InputManager.cpp
View file

@ -174,6 +174,11 @@ void InputManager::deinit()
SDL_JoystickEventState(SDL_DISABLE);
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
if (sInstance) {
delete sInstance;
sInstance = nullptr;
}
}
int InputManager::getNumJoysticks()

11
es-core/src/resources/Font.cpp
View file

@ -93,6 +93,17 @@ Font::Font(int size, const std::string& path) : mSize(size), mPath(path)
Font::~Font()
{
unload(ResourceManager::getInstance());
auto fontEntry = sFontMap.find(std::pair<std::string, int>(mPath, mSize));
if (fontEntry != sFontMap.cend()) {
sFontMap.erase(fontEntry);
}
if (sFontMap.empty() && sLibrary) {
FT_Done_FreeType(sLibrary);
sLibrary = nullptr;
}
}
void Font::reload(std::shared_ptr<ResourceManager>& /*rm*/)