fix(ascii_composer): first read ascii_composer/good_old_caps_lock fro…

…m schema config
rime · Aug 23, 2020 · 3fc56c4 · 3fc56c4
1 parent cc983d5
commit 3fc56c4
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/src/rime/gear/ascii_composer.cc b/src/rime/gear/ascii_composer.cc
@@ -177,26 +177,26 @@ void AsciiComposer::LoadConfig(Schema* schema) {
   good_old_caps_lock_ = false;
   if (!schema)
     return;
-  the<Config> preset_config(
-      Config::Require("config")->Create("default"));
-  if (preset_config) {
-    preset_config->GetBool("ascii_composer/good_old_caps_lock",
-                           &good_old_caps_lock_);
-  }
   Config* config = schema->config();
-  auto bindings = config->GetMap("ascii_composer/switch_key");
-  if (!bindings) {
-    if (!preset_config) {
-      LOG(ERROR) << "Error importing preset ascii bindings.";
-      return;
-    }
-    bindings = preset_config->GetMap("ascii_composer/switch_key");
-    if (!bindings) {
-      LOG(WARNING) << "missing preset ascii bindings.";
-      return;
+  the<Config> preset_config(Config::Require("config")->Create("default"));
+  if (!config->GetBool("ascii_composer/good_old_caps_lock",
+                       &good_old_caps_lock_)) {
+    if (preset_config) {
+      preset_config->GetBool("ascii_composer/good_old_caps_lock",
+                             &good_old_caps_lock_);
     }
   }
-  load_bindings(bindings, &bindings_);
+  if (auto bindings = config->GetMap("ascii_composer/switch_key")) {
+    load_bindings(bindings, &bindings_);
+  }
+  else if (auto bindings = preset_config
+           ? preset_config->GetMap("ascii_composer/switch_key")
+           : nullptr) {
+    load_bindings(bindings, &bindings_);
+  } else {
+    LOG(ERROR) << "Missing ascii bindings.";
+    return;
+  }
   auto it = bindings_.find(XK_Caps_Lock);
   if (it != bindings_.end()) {
     caps_lock_switch_style_ = it->second;