Unlock the font settings when returning to the Game Browser

EasyRPG · May 13, 2024 · efd7332 · efd7332
1 parent 3ed35a9
commit efd7332
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/font.cpp b/src/font.cpp
@@ -662,7 +662,7 @@ void Font::ResetDefault() {
 	SetDefault(nullptr, false);
 
 #ifdef HAVE_FREETYPE
-	const auto& cfg = Player::player_config;
+	auto& cfg = Player::player_config;
 	if (!cfg.font1.Get().empty()) {
 		auto is = FileFinder::Root().OpenInputStream(cfg.font1.Get());
 		SetDefault(CreateFtFont(std::move(is), cfg.font1_size.Get(), false, false), false);
@@ -672,6 +672,9 @@ void Font::ResetDefault() {
 		auto is = FileFinder::Root().OpenInputStream(cfg.font2.Get());
 		SetDefault(CreateFtFont(std::move(is), cfg.font2_size.Get(), false, false), true);
 	}
+
+	cfg.font1.SetLocked(false);
+	cfg.font2.SetLocked(false);
 #endif
 }
 

diff --git a/src/player.cpp b/src/player.cpp
@@ -1053,7 +1053,6 @@ void Player::LoadFonts() {
 #ifdef HAVE_FREETYPE
 	// Look for bundled fonts
 	auto gothic = FileFinder::OpenFont("Font");
-	player_config.font1.SetLocked(false);
 	if (gothic) {
 		auto ft = Font::CreateFtFont(std::move(gothic), 12, false, false);
 		player_config.font1.SetLocked(ft != nullptr);
@@ -1063,7 +1062,6 @@ void Player::LoadFonts() {
 	}
 
 	auto mincho = FileFinder::OpenFont("Font2");
-	player_config.font2.SetLocked(false);
 	if (mincho) {
 		auto ft = Font::CreateFtFont(std::move(mincho), 12, false, false);
 		player_config.font2.SetLocked(ft != nullptr);