From 837c5bc04a0872a0ee161f820ef58a7355e8564e Mon Sep 17 00:00:00 2001
From: Horror Proton <107091537+horror-proton@users.noreply.github.com>
Date: Fri, 2 Aug 2024 13:32:51 +0800
Subject: [PATCH] feat: fallback to General config

---
 src/MaaCore/Controller/AdbController.cpp       |  4 ++++
 src/MaaCore/Controller/MinitouchController.cpp | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/MaaCore/Controller/AdbController.cpp b/src/MaaCore/Controller/AdbController.cpp
index bc66e28004..64395d5b57 100644
--- a/src/MaaCore/Controller/AdbController.cpp
+++ b/src/MaaCore/Controller/AdbController.cpp
@@ -705,7 +705,11 @@ bool asst::AdbController::connect(
                                  { "why", "ConfigNotFound" },
                              };
         callback(AsstMsg::ConnectionInfo, info);
+#ifdef ASST_DEBUG
         return false;
+#endif
+        Log.error("config ", config, "not found");
+        adb_ret = Config.get_adb_cfg("General");
     }
 
     const auto& adb_cfg = adb_ret.value();
diff --git a/src/MaaCore/Controller/MinitouchController.cpp b/src/MaaCore/Controller/MinitouchController.cpp
index 19e62161c5..adcbc2053d 100644
--- a/src/MaaCore/Controller/MinitouchController.cpp
+++ b/src/MaaCore/Controller/MinitouchController.cpp
@@ -368,7 +368,17 @@ bool asst::MinitouchController::connect(const std::string& adb_path, const std::
     auto adb_ret = Config.get_adb_cfg(config);
 
     if (!adb_ret) {
+        json::value info = get_info_json()
+                           | json::object {
+                                 { "what", "ConnectFailed" },
+                                 { "why", "ConfigNotFound" },
+                             };
+        callback(AsstMsg::ConnectionInfo, info);
+#ifdef ASST_DEBUG
         return false;
+#endif
+        Log.error("config ", config, "not found");
+        adb_ret = Config.get_adb_cfg("General");
     }
 
     const auto& adb_cfg = adb_ret.value();