fix(switcher): deactivate before setting option

Fixes #918

Author: lotem

src/rime/gear/schema_list_translator.cc

@@ -25,12 +25,13 @@ class SchemaSelection : public SimpleCandidate, public SwitcherCommand {
 };
 
 void SchemaSelection::Apply(Switcher* switcher) {
-  switcher->Deactivate();
-  if (Engine* engine = switcher->attached_engine()) {
-    if (keyword_ != engine->schema()->schema_id()) {
-      engine->ApplySchema(new Schema(keyword_));
+  switcher->DeactivateAndApply([this, switcher] {
+    if (Engine* engine = switcher->attached_engine()) {
+      if (keyword_ != engine->schema()->schema_id()) {
+        engine->ApplySchema(new Schema(keyword_));
+      }
     }
-  }
+  });
 }
 
 class SchemaAction : public ShadowCandidate, public SwitcherCommand {

src/rime/gear/switch_translator.cc

@@ -55,15 +55,16 @@ class Switch : public SimpleCandidate, public SwitcherCommand {
 };
 
 void Switch::Apply(Switcher* switcher) {
-  if (Engine* engine = switcher->attached_engine()) {
-    engine->context()->set_option(keyword_, target_state_);
-  }
-  if (auto_save_) {
-    if (Config* user_config = switcher->user_config()) {
-      user_config->SetBool("var/option/" + keyword_, target_state_);
+  switcher->DeactivateAndApply([this, switcher] {
+    if (Engine* engine = switcher->attached_engine()) {
+      engine->context()->set_option(keyword_, target_state_);
     }
-  }
-  switcher->Deactivate();
+    if (auto_save_) {
+      if (Config* user_config = switcher->user_config()) {
+        user_config->SetBool("var/option/" + keyword_, target_state_);
+      }
+    }
+  });
 }
 
 class RadioOption;
@@ -100,8 +101,7 @@ class RadioOption : public SimpleCandidate, public SwitcherCommand {
 };
 
 void RadioOption::Apply(Switcher* switcher) {
-  group_->SelectOption(this);
-  switcher->Deactivate();
+  switcher->DeactivateAndApply([this] { group_->SelectOption(this); });
 }
 
 void RadioOption::UpdateState(bool selected) {

src/rime/switcher.cc

@@ -249,9 +249,16 @@ void Switcher::Activate() {
 }
 
 void Switcher::Deactivate() {
-  context_->Clear();
+  active_ = false;
   engine_->set_active_engine();
+  context_->Clear();
+}
+
+void Switcher::DeactivateAndApply(function<void()> apply) {
   active_ = false;
+  engine_->set_active_engine();
+  apply();
+  context_->Clear();
 }
 
 void Switcher::LoadSettings() {

src/rime/switcher.h

@@ -40,6 +40,7 @@ class Switcher : public Processor, public Engine {
   void RefreshMenu();
   void Activate();
   void Deactivate();
+  void DeactivateAndApply(function<void()> apply);
 
   Engine* attached_engine() const { return engine_; }
   Config* user_config() const { return user_config_.get(); }