From 9017d65152fd18fc7fc6c55fe6254bb8bee6b69d Mon Sep 17 00:00:00 2001 From: Martti Date: Sat, 20 Jan 2024 02:47:34 +0000 Subject: [PATCH] Fix Check order --- mktxp/flow/router_entry.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mktxp/flow/router_entry.py b/mktxp/flow/router_entry.py index a285a07..81e8369 100644 --- a/mktxp/flow/router_entry.py +++ b/mktxp/flow/router_entry.py @@ -76,9 +76,7 @@ class RouterEntry: def wireless_type(self): router_entry = self if self._wireless_type == RouterEntryWirelessType.NONE: - if SystemResourceMetricsDataSource.is_os_with_wifi_builtin(router_entry): - self._wireless_type = RouterEntryWirelessType.WIFI - elif PackageMetricsDataSource.is_package_installed(router_entry, package_name = RouterEntryWirelessPackage.WIFI_PACKAGE): + if PackageMetricsDataSource.is_package_installed(router_entry, package_name = RouterEntryWirelessPackage.WIFI_PACKAGE): self._wireless_type = RouterEntryWirelessType.WIFI elif PackageMetricsDataSource.is_package_installed(router_entry, package_name = RouterEntryWirelessPackage.WIFI_AC_PACKAGE): self._wireless_type = RouterEntryWirelessType.WIFI @@ -86,6 +84,8 @@ class RouterEntry: self._wireless_type = RouterEntryWirelessType.WIFIWAVE2 elif PackageMetricsDataSource.is_package_installed(router_entry, package_name = RouterEntryWirelessPackage.WIRELESS_PACKAGE): self._wireless_type = RouterEntryWirelessType.DUAL + elif SystemResourceMetricsDataSource.is_os_with_wifi_builtin(router_entry): + self._wireless_type = RouterEntryWirelessType.WIFI else: self._wireless_type = RouterEntryWirelessType.WIRELESS return self._wireless_type