From dabd23a5ee45095199f55abad5e88354df644989 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Tue, 8 Jul 2025 13:11:19 -0700
Subject: [PATCH] Finish LUS bump, including SoH-side fix for font free crash.

---
 libultraship           | 2 +-
 soh/soh/OTRGlobals.cpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libultraship b/libultraship
index 5e33d3e7c..7f737f8be 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 5e33d3e7cd0396f847923cd6c471eaf324e90351
+Subproject commit 7f737f8be9580980f5a1fe7784d6e1045f0309da
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 50492bc4f..d59871d54 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -1678,7 +1678,9 @@ ImFont* OTRGlobals::CreateFontWithSize(float size, std::string fontPath) {
         initData->Path = fontPath;
         std::shared_ptr<Ship::Font> fontData = std::static_pointer_cast<Ship::Font>(
             Ship::Context::GetInstance()->GetResourceManager()->LoadResource(fontPath, false, initData));
-        font = mImGuiIo->Fonts->AddFontFromMemoryTTF(fontData->Data, fontData->DataSize, size);
+        ImFontConfig fontConf;
+        fontConf.FontDataOwnedByAtlas = false;
+        font = mImGuiIo->Fonts->AddFontFromMemoryTTF(fontData->Data, fontData->DataSize, size, &fontConf);
     }
     // FontAwesome fonts need to have their sizes reduced by 2.0f/3.0f in order to align correctly
     float iconFontSize = size * 2.0f / 3.0f;