fix(tools): recreate session when necessary

rime · Jun 12, 2024 · 4f8bad3 · 4f8bad3
1 parent a735e42
commit 4f8bad3
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/tools/rime_api_console.cc b/tools/rime_api_console.cc
@@ -187,6 +187,15 @@ void on_message(void* context_object,
   }
 }
 
+bool ensure_session(RimeApi* rime, RimeSessionId& session_id) {
+  session_id = rime->create_session();
+  if (!session_id) {
+    fprintf(stderr, "Error creating rime session.\n");
+    return false;
+  }
+  return true;
+}
+
 int main(int argc, char* argv[]) {
   unsigned int codepage = SetConsoleOutputCodePage();
   RimeApi* rime = rime_get_api();
@@ -205,9 +214,8 @@ int main(int argc, char* argv[]) {
     rime->join_maintenance_thread();
   fprintf(stderr, "ready.\n");
 
-  RimeSessionId session_id = rime->create_session();
-  if (!session_id) {
-    fprintf(stderr, "Error creating rime session.\n");
+  RimeSessionId session_id;
+  if (!ensure_session(rime, session_id)) {
     SetConsoleOutputCodePage(codepage);
     return 1;
   }
@@ -221,6 +229,10 @@ int main(int argc, char* argv[]) {
         break;
       }
     }
+    if (!rime->find_session(session_id) && !ensure_session(rime, session_id)) {
+      SetConsoleOutputCodePage(codepage);
+      return 1;
+    }
     if (!strcmp(line, "exit"))
       break;
     else if (!strcmp(line, "reload")) {