fix autoconnect#2

ArkToria · Mar 20, 2022 · f0b7b3c · f0b7b3c
1 parent 359f804
commit f0b7b3c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/i18n/across_zh_CN.ts b/i18n/across_zh_CN.ts
@@ -1391,7 +1391,7 @@
 <context>
     <name>across::NodeList</name>
     <message>
-        <location filename="../src/view_models/nodelist.cpp" line="337"/>
+        <location filename="../src/view_models/nodelist.cpp" line="325"/>
         <source>Copy [%1] URL to clipboard</source>
         <translation>复制 [%1] 链接到剪贴板</translation>
     </message>

diff --git a/src/app.cpp b/src/app.cpp
@@ -113,9 +113,14 @@ QFuture<void> Application::checkAndReconnect() {
         for (int i = 0; i < 10; i++) {
             wait(200);
             if (this->p_acolors->isConnected())
-                return;
+                break;
             this->p_acolors->reconnect();
         }
+        if (this->p_config->enableAutoConnect()) {
+            auto status = this->p_acolors->core()->run();
+            if (!status.ok())
+                qDebug() << status.error_message().c_str();
+        }
     });
 }
 

diff --git a/src/view_models/nodelist.cpp b/src/view_models/nodelist.cpp
@@ -110,18 +110,6 @@ void NodeList::init(QSharedPointer<across::setting::ConfigTools> config,
                 });
     }
 
-    if (p_config->enableAutoConnect()) {
-        if (!run()) {
-            p_logger->error("Failed to start current node: {} {}", m_node.id,
-                            m_node.name.toStdString());
-        }
-
-        emit currentGroupIDChanged();
-        emit currentNodeIDChanged();
-        emit currentNodeInfoChanged(m_node.toVariantMap());
-        emit currentNodeChanged(m_node);
-    }
-
     reloadItems();
 }