diff --git a/LunaTranslator/LunaTranslator/gui/selecthook.py b/LunaTranslator/LunaTranslator/gui/selecthook.py index 90b05b41..a35195ff 100644 --- a/LunaTranslator/LunaTranslator/gui/selecthook.py +++ b/LunaTranslator/LunaTranslator/gui/selecthook.py @@ -218,11 +218,15 @@ class searchhookparam(LDialog): layout1 = QHBoxLayout() layout1.addWidget(LLabel("代码页")) - self.codepagesave = { - "spcp": savehook_new_data[gobject.baseobject.textsource.gameuid].get( - "codepage_index", globalconfig["codepage_index"] - ) - } + if savehook_new_data[gobject.baseobject.textsource.gameuid][ + "hooksetting_follow_default" + ]: + cp = globalconfig["codepage_index"] + else: + cp = savehook_new_data[gobject.baseobject.textsource.gameuid][ + "hooksetting_private" + ].get("codepage_index", globalconfig["codepage_index"]) + self.codepagesave = {"spcp": cp} layout1.addWidget( getsimplecombobox( static_data["codepage_display"], self.codepagesave, "spcp" diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index b6f7bd33..f0e1f878 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -29,7 +29,7 @@ include(generate_product_version) set(VERSION_MAJOR 5) set(VERSION_MINOR 15) -set(VERSION_PATCH 11) +set(VERSION_PATCH 12) add_library(pch pch.cpp) target_precompile_headers(pch PUBLIC pch.h)