Skip to content

fix(memory): Fixed memory leaks at shutdown #6667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bassdr wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

fix(memory): Fixed memory leaks at shutdown #6667

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c3eedc
Fixed crash and memory leaks at shutdown
bassdr Jun 1, 2026
b37c0b2
Merge remote-tracking branch 'origin/develop' into fix/shutdown-crash
bassdr Jun 23, 2026
e7334d6
fix(crash): null-check controllerConfigWindow before TestingRumble
bassdr Jun 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 31 additions & 16 deletions soh/soh/OTRGlobals.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,16 @@ const float imguiScaleOptionToValue[4] = { 0.75f, 1.0f, 1.5f, 2.0f };

bool SoH_HandleConfigDrop(char* filePath);

OTRGlobals* OTRGlobals::Instance;
SaveManager* SaveManager::Instance;
CustomMessageManager* CustomMessageManager::Instance;
ItemTableManager* ItemTableManager::Instance;
GameInteractor* GameInteractor::Instance;
AudioCollection* AudioCollection::Instance;
SpeechSynthesizer* SpeechSynthesizer::Instance;
CrowdControl* CrowdControl::Instance;
Sail* Sail::Instance;
Anchor* Anchor::Instance;
OTRGlobals* OTRGlobals::Instance = nullptr;
SaveManager* SaveManager::Instance = nullptr;
CustomMessageManager* CustomMessageManager::Instance = nullptr;
ItemTableManager* ItemTableManager::Instance = nullptr;
GameInteractor* GameInteractor::Instance = nullptr;
AudioCollection* AudioCollection::Instance = nullptr;
SpeechSynthesizer* SpeechSynthesizer::Instance = nullptr;
CrowdControl* CrowdControl::Instance = nullptr;
Sail* Sail::Instance = nullptr;
Anchor* Anchor::Instance = nullptr;

extern "C" char** cameraStrings;

Expand Down Expand Up @@ -1632,7 +1632,16 @@ extern "C" void DeinitOTR() {
SohGui::Destroy();
sohFast3dWindow = nullptr;

OTRGlobals::Instance->context = nullptr;
delete SaveManager::Instance;
SaveManager::Instance = nullptr;
delete GameInteractor::Instance;
GameInteractor::Instance = nullptr;
delete ItemTableManager::Instance;
ItemTableManager::Instance = nullptr;
delete CustomMessageManager::Instance;
CustomMessageManager::Instance = nullptr;
delete OTRGlobals::Instance;
OTRGlobals::Instance = nullptr;
}

#ifdef _WIN32
Expand Down Expand Up @@ -2177,12 +2186,18 @@ extern "C" void OTRControllerCallback(uint8_t rumble) {
Ship::Context::GetRawInstance()->GetControlDeck()->GetControllerByPort(0)->GetLED()->SetLEDColor(
GetColorForControllerLED());

static std::shared_ptr<SohInputEditorWindow> controllerConfigWindow = nullptr;
static std::weak_ptr<SohInputEditorWindow> sControllerConfigWindow{};
auto controllerConfigWindow = sControllerConfigWindow.lock();
if (controllerConfigWindow == nullptr) {
controllerConfigWindow = std::dynamic_pointer_cast<SohInputEditorWindow>(
std::dynamic_pointer_cast<Fast::Fast3dGui>(Ship::Context::GetRawInstance()->GetWindow()->GetGui())
->GetGuiWindow("Controller Configuration"));
} else if (controllerConfigWindow->TestingRumble()) {
auto gui = std::dynamic_pointer_cast<Fast::Fast3dGui>(Ship::Context::GetRawInstance()->GetWindow()->GetGui());
if (gui != nullptr)
controllerConfigWindow =
std::dynamic_pointer_cast<SohInputEditorWindow>(gui->GetGuiWindow("Controller Configuration"));

sControllerConfigWindow = controllerConfigWindow;
}

if (controllerConfigWindow != nullptr && controllerConfigWindow->TestingRumble()) {
return;
}

Expand Down
Loading