diff --git a/fcitx5-rime b/fcitx5-rime index 6f9b3ef..d589911 160000 --- a/fcitx5-rime +++ b/fcitx5-rime @@ -1 +1 @@ -Subproject commit 6f9b3ef2dd7be2ddbf04c3fbedf38f755fc174f6 +Subproject commit d58991193aca771305435954de4614117eab9009 diff --git a/patches/rime.patch b/patches/rime.patch index 8aea334..4ec1af2 100644 --- a/patches/rime.patch +++ b/patches/rime.patch @@ -1,8 +1,8 @@ diff --git a/src/rimeengine.cpp b/src/rimeengine.cpp -index b335069..ca08611 100644 +index cdaaa3d..4295375 100644 --- a/src/rimeengine.cpp +++ b/src/rimeengine.cpp -@@ -46,6 +46,7 @@ +@@ -47,6 +47,7 @@ #include #include #include @@ -10,16 +10,16 @@ index b335069..ca08611 100644 FCITX_DEFINE_LOG_CATEGORY(rime_log, "rime"); -@@ -299,13 +300,26 @@ void RimeEngine::rimeStart(bool fullcheck) { +@@ -287,13 +288,26 @@ void RimeEngine::rimeStart(bool fullcheck) { + fcitx_rime_traits.modules = nullptr; - #endif + bool autoDeploy = false; if (firstRun_) { api_->setup(&fcitx_rime_traits); firstRun_ = false; + if (!EM_ASM_INT(return fcitx.isWorker)) { -+ autoDeploy = !fs::isreg(stringutils::joinPath(userDir, "build/default.yaml")); ++ autoDeploy = !fs::isreg(userDir / "build/default.yaml"); + } } api_->initialize(&fcitx_rime_traits); @@ -38,7 +38,7 @@ index b335069..ca08611 100644 if (!api_->is_maintenance_mode()) { updateAppOptions(); -@@ -582,12 +596,13 @@ void RimeEngine::notify(RimeSessionId session, const std::string &messageType, +@@ -521,12 +535,13 @@ void RimeEngine::notify(RimeSessionId session, const std::string &messageType, bool blockMessage = false; if (messageType == "deploy") { tipId = "fcitx-rime-deploy"; @@ -53,7 +53,7 @@ index b335069..ca08611 100644 if (!api_->is_maintenance_mode()) { if (needRefreshAppOption_) { api_->deploy_config_file("fcitx5.yaml", "config_version"); -@@ -602,6 +617,7 @@ void RimeEngine::notify(RimeSessionId session, const std::string &messageType, +@@ -541,6 +556,7 @@ void RimeEngine::notify(RimeSessionId session, const std::string &messageType, needRefreshAppOption_ = false; message = _("Rime has encountered an error. " "See log for details.");