update some logic

mokapsing · Apr 3, 2024 · 559e389 · 559e389
1 parent a16a155
commit 559e389
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/rimestate.cpp b/src/rimestate.cpp
@@ -135,11 +135,10 @@ void RimeState::switchNextSchema() {
         return;
     }
     targetSchemaId = *schemas.begin();
-    auto it = schemas.find(currentSchemaId);
-    if (it != schemas.end()) {
-        ++it;
-        if (it != schemas.end()) {
-            targetSchemaId = *it;
+    if (!schemas.empty()) {
+        auto it = std::find(schemas.begin(), schemas.end(), currentSchemaId);
+	if (it != schemas.end() && std::next(it) != schemas.end()) {
+            targetSchemaId = *std::next(it);
         }
     }
     if (targetSchemaId.empty()) {