fix fonts change crashing

maxnut · May 11, 2024 · 503c91a · 503c91a
1 parent eb54adf
commit 503c91a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3 deletions.
diff --git a/mod.json b/mod.json
@@ -3,7 +3,7 @@
 	"gd": {
 		"win": "2.204"
 	},
-	"version": "v2.11.0",
+	"version": "v2.11.1",
 	"id": "maxnu.gd_mega_overlay",
 	"name": "GD Mega Overlay",
 	"developers": ["maxnu", "SpaghettDev"],

diff --git a/src/GUI/GUI.cpp b/src/GUI/GUI.cpp
@@ -440,6 +440,7 @@ void GUI::setFont(const ghc::filesystem::path& font)
 {
 	ImFont* fnt = ImGui::GetIO().Fonts->AddFontFromFileTTF(string::wideToUtf8(font.wstring()).c_str(), fontScale * uiSizeFactor);
 	ImGui::GetIO().FontDefault = fnt;
+	ImGuiCocos::get().reloadFontTexture();
 }
 
 void GUI::setStyle()

diff --git a/src/GUI/StyleEditor.cpp b/src/GUI/StyleEditor.cpp
@@ -68,7 +68,6 @@ void GUI::drawStyleEditor()
             if(ImGui::IsItemDeactivatedAfterEdit())
             {
                 GUI::setFont(GUI::fontCombo.getSelectedFilePath());
-                ImGuiCocos::get().reloadFontTexture();
             }
 
             ImGui::Text("Borders");

diff --git a/src/main.cpp b/src/main.cpp
@@ -445,7 +445,6 @@ void initGUI()
 		{
 			GUI::loadStyle(GUI::styleCombo.getSelectedFilePath());
 			GUI::setFont(GUI::fontCombo.getSelectedFilePath());
-            ImGuiCocos::get().reloadFontTexture();
 		}
 
 		if(GUI::fontCombo.draw())