Merge branch 'master' of http://192.168.10.5:8099/sane/code_lang

2023-01-29 15:27:23 +08:00 · 2023-01-29 15:27:23 +08:00 · 8b60fc5047
parent 749f4afe1d c20c22ae5e
commit 8b60fc5047
2 changed files with 1250 additions and 1203 deletions
--- a/app_language.cpp
+++ b/app_language.cpp
@ -711,7 +711,7 @@ public:
 			return in;
 		}

-		int id = get_string_id(in, false);
+		int id = get_string_id(in, !to_def);
 		std::map<uint32_t, std::string>* t = to_def ? &map_default_ : pak_now_;

 		if (id == -1)
--- a/base_pak.h
+++ b/base_pak.h