fix fonts change crashing

maxnut · maxnut · commit 503c91a3fdae · 2024-05-11T13:34:51.000+02:00
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())

Original file line number	Diff line number	Diff line change
`@@ -440,6 +440,7 @@ void GUI::setFont(const ghc::filesystem::path& font)`
`440`	`440`	`{`
`441`	`441`	`ImFont* fnt = ImGui::GetIO().Fonts->AddFontFromFileTTF(string::wideToUtf8(font.wstring()).c_str(), fontScale * uiSizeFactor);`
`442`	`442`	`ImGui::GetIO().FontDefault = fnt;`
	`443`	`+ ImGuiCocos::get().reloadFontTexture();`
`443`	`444`	`}`
`444`	`445`
`445`	`446`	`void GUI::setStyle()`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ void GUI::drawStyleEditor()`
`68`	`68`	`if(ImGui::IsItemDeactivatedAfterEdit())`
`69`	`69`	`{`
`70`	`70`	`GUI::setFont(GUI::fontCombo.getSelectedFilePath());`
`71`		`- ImGuiCocos::get().reloadFontTexture();`
`72`	`71`	`}`
`73`	`72`
`74`	`73`	`ImGui::Text("Borders");`
Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,6 @@ void initGUI()`
`445`	`445`	`{`
`446`	`446`	`GUI::loadStyle(GUI::styleCombo.getSelectedFilePath());`
`447`	`447`	`GUI::setFont(GUI::fontCombo.getSelectedFilePath());`
`448`		`- ImGuiCocos::get().reloadFontTexture();`
`449`	`448`	`}`
`450`	`449`
`451`	`450`	`if(GUI::fontCombo.draw())`