Merge pull request #2335 from Asizon/improve_hardwareId_check

Improving hardwareId behavior
betaflight · Dec 13, 2020 · 21f5137 · 21f5137
2 parents a249110 + 0a98eee
commit 21f5137
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/components/betaflight-logo/BetaflightLogo.vue b/src/components/betaflight-logo/BetaflightLogo.vue
@@ -18,6 +18,8 @@
   opacity: 0.5;
   font-size: 10px;
   min-width: 210px;
+  display: flex;
+  flex-direction: column;
 }
 
 .tab_container .logo {
@@ -73,15 +75,13 @@
     <div class="logo_text">
       <span>
         {{ $t("versionLabelConfigurator") }}: {{ configuratorVersion }}
-        <br />
-        <span v-if="firmwareVersion && firmwareId">
-          {{ $t("versionLabelFirmware") }}: {{ firmwareVersion }}
-          {{ firmwareId }}
-        </span>
-        <br />
-        <span v-if="hardwareId">
-          {{ $t("versionLabelTarget") }}: {{ hardwareId }}
-        </span>
+      </span>
+      <span v-if="firmwareVersion && firmwareId">
+        {{ $t("versionLabelFirmware") }}: {{ firmwareVersion }}
+        {{ firmwareId }}
+      </span>
+      <span v-if="hardwareId">
+        {{ $t("versionLabelTarget") }}: {{ hardwareId }}
       </span>
     </div>
   </div>

diff --git a/src/js/port_handler.js b/src/js/port_handler.js
@@ -90,7 +90,7 @@ PortHandler.check_usb_devices = function (callback) {
             callback(self.dfu_available);
         }
         if (!$('option:selected', self.portPickerElement).data().isDFU) {
-            if (!GUI.connected_to) {
+            if (!(GUI.connected_to || GUI.connect_lock)) {
                 FC.resetState();
             }
             self.portPickerElement.trigger('change');