From 9656b40d53375455b144a41ac9b093a3a65345bb Mon Sep 17 00:00:00 2001 From: WerWolv Date: Tue, 20 Sep 2022 15:47:28 +0200 Subject: [PATCH] fix: Clearing custom font path not updating setting correctly --- main/source/init/tasks.cpp | 2 +- plugins/builtin/source/content/settings_entries.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/source/init/tasks.cpp b/main/source/init/tasks.cpp index d9959c846..f019295ad 100644 --- a/main/source/init/tasks.cpp +++ b/main/source/init/tasks.cpp @@ -133,7 +133,7 @@ namespace hex::init { 0x0100, 0xFFF0, 0 }; - auto fontFile = ImHexApi::System::getCustomFontPath(); + const auto &fontFile = ImHexApi::System::getCustomFontPath(); float fontSize = ImHexApi::System::getFontSize(); if (fontFile.empty()) { // Load default font if no custom one has been specified diff --git a/plugins/builtin/source/content/settings_entries.cpp b/plugins/builtin/source/content/settings_entries.cpp index 4119b90ac..33548fce3 100644 --- a/plugins/builtin/source/content/settings_entries.cpp +++ b/plugins/builtin/source/content/settings_entries.cpp @@ -494,11 +494,11 @@ namespace hex::plugin::builtin { } } + ImHexApi::System::impl::setCustomFontPath(fontFile); + // If a custom font has been loaded now, also load the font size float fontSize = ImHexApi::System::DefaultFontSize * ImHexApi::System::getGlobalScale(); if (!fontFile.empty()) { - ImHexApi::System::impl::setCustomFontPath(fontFile); - fontSize = ContentRegistry::Settings::read("hex.builtin.setting.font", "hex.builtin.setting.font.font_size", 13) * ImHexApi::System::getGlobalScale(); }