mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2025-04-10 19:15:13 +00:00
Improved the cleanup on window deinit
This commit is contained in:
parent
d7f3ee7f17
commit
11bcf8d3f8
|
@ -217,6 +217,13 @@ void Window::deinit()
|
||||||
(*it)->onHide();
|
(*it)->onHide();
|
||||||
|
|
||||||
mPostprocessedBackground.reset();
|
mPostprocessedBackground.reset();
|
||||||
|
mHelp.reset();
|
||||||
|
mHelpComponents->clear();
|
||||||
|
mHelpComponents = nullptr;
|
||||||
|
mClockComponents->clear();
|
||||||
|
mClockComponents = nullptr;
|
||||||
|
mSystemStatusComponents->clear();
|
||||||
|
mSystemStatusComponents = nullptr;
|
||||||
|
|
||||||
InputManager::getInstance().deinit();
|
InputManager::getInstance().deinit();
|
||||||
ResourceManager::getInstance().unloadAll();
|
ResourceManager::getInstance().unloadAll();
|
||||||
|
@ -928,7 +935,7 @@ void Window::setHelpPrompts(const std::vector<HelpPrompt>& prompts)
|
||||||
helpComponent->setPrompts(addPrompts);
|
helpComponent->setPrompts(addPrompts);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else if (mHelp != nullptr) {
|
||||||
mHelp->setPrompts(addPrompts);
|
mHelp->setPrompts(addPrompts);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue