otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

finally fix invalid module disrupting program

Browse source
This commit is contained in:
tildearrow 2021-12-19 21:11:23 -05:00
parent f327e036ce
commit 498fa99c5a
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/gui/gui.cpp
View file

@ -1768,11 +1768,11 @@ int FurnaceGUI::load(String path) {
if (!e->load(file,(size_t)len)) {
logE("could not open file!\n");
e->initDispatch();
e->reset();
e->syncReset();
return 1;
}
e->initDispatch();
e->reset();
e->syncReset();
}
updateWindowTitle();
return 0;
@ -2058,11 +2058,11 @@ bool FurnaceGUI::init() {
ImGui::GetIO().ConfigFlags|=ImGuiConfigFlags_DockingEnable;
ImGui::GetIO().IniFilename=finalLayoutPath;
if ((mainFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(defFont_main_compressed_data,defFont_main_compressed_size,18*dpiScale))==NULL) {
if ((mainFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(defFont_main_compressed_data,defFont_main_compressed_size,e->getConfInt("mainFontSize",18)*dpiScale))==NULL) {
logE("could not load UI font!\n");
return false;
}
if ((patFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(defFont_pat_compressed_data,defFont_pat_compressed_size,18*dpiScale))==NULL) {
if ((patFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(defFont_pat_compressed_data,defFont_pat_compressed_size,e->getConfInt("patFontSize",18)*dpiScale))==NULL) {
logE("could not load pattern font!\n");
return false;
}