From a6110dbc51685f7da94737072899dc3ea4e21ae6 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Thu, 10 Oct 2024 16:11:19 -0700
Subject: [PATCH] Update SoH's input editor window for the gui rework, and set
 it as what's opened by the Controller Configuration button. (#4352)

---
 soh/soh/Enhancements/controls/SohInputEditorWindow.cpp | 2 --
 soh/soh/OTRGlobals.cpp                                 | 2 +-
 soh/soh/SohGui.cpp                                     | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp b/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
index a5c1364b8..a3745ee72 100644
--- a/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
+++ b/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
@@ -2145,7 +2145,6 @@ void SohInputEditorWindow::DrawSetDefaultsButton(uint8_t portIndex) {
 }
 
 void SohInputEditorWindow::DrawElement() {
-    ImGui::Begin("Controller Configuration###sohControllerConfigWindowV1", &mIsVisible);
     ImGui::BeginTabBar("##ControllerConfigPortTabs");
     DrawLinkTab();
     DrawIvanTab();
@@ -2154,5 +2153,4 @@ void SohInputEditorWindow::DrawElement() {
         DrawDebugPortTab(3);
     }
     ImGui::EndTabBar();
-    ImGui::End();
 }
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 32b035f82..1940be515 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -336,7 +336,7 @@ OTRGlobals::OTRGlobals() {
     context->InitCrashHandler();
     context->InitConsole();
 
-    auto sohInputEditorWindow = std::make_shared<SohInputEditorWindow>(CVAR_CONTROLLER_CONFIGURATION_WINDOW_OPEN, "Input Editor");
+    auto sohInputEditorWindow = std::make_shared<SohInputEditorWindow>(CVAR_CONTROLLER_CONFIGURATION_WINDOW_OPEN, "Controller Configuration");
     context->InitWindow({ sohInputEditorWindow });
 
     auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay();
diff --git a/soh/soh/SohGui.cpp b/soh/soh/SohGui.cpp
index eda8641ef..2d47d2a38 100644
--- a/soh/soh/SohGui.cpp
+++ b/soh/soh/SohGui.cpp
@@ -161,7 +161,7 @@ namespace SohGui {
             SPDLOG_ERROR("Could not find console window");
         }
 
-        mInputEditorWindow = gui->GetGuiWindow("Input Editor");
+        mInputEditorWindow = gui->GetGuiWindow("Controller Configuration");
         if (mInputEditorWindow == nullptr) {
             SPDLOG_ERROR("Could not find input editor window");
         }