Merge pull request betaflight#2660 from haslinghuis/fix_tab_switch

Fix tab switching

Author: ctzsnooze

src/js/main.js

@@ -250,10 +250,12 @@ function startProcess() {
 
             const tab = tabClass.substring(4);
             const tabName = $(self).text();
+            let timeout = 0;
 
             if (GUI.active_tab === 'pid_tuning') {
                 if (TABS.pid_tuning.retainConfiguration) {
                     TABS.pid_tuning.restoreInitialSettings();
+                    timeout = 100;
                 }
             }
 
@@ -399,7 +401,8 @@ function startProcess() {
                         TABS.onboard_logging.initialize(content_ready);
                         break;
                     case 'cli':
-                        TABS.cli.initialize(content_ready, GUI.nwGui);
+                        // Add a little timeout to let MSP comands finish
+                        GUI.timeout_add('wait_for_msp_finished', () => TABS.cli.initialize(content_ready, GUI.nwGui), timeout);
                         break;
                     case 'presets':
                         TABS.presets.initialize(content_ready, GUI.nwGui);

src/tabs/presets/TitlePanel/PresetTitlePanel.js

@@ -13,6 +13,7 @@ class PresetTitlePanel
         this._parentDiv.append(`<div class="${this._domId}"></div>`);
         this._domWrapperDiv = $(`.${this._domId}`);
         this._domWrapperDiv.toggle(false);
+        this._clickable = clickable;
 
         if (clickable) {
             this._domWrapperDiv.addClass("preset_title_panel_border");
@@ -41,6 +42,10 @@ class PresetTitlePanel
     }
 
     setPicked(isPicked) {
+        if (!this._clickable) {
+            return;
+        }
+
         this._preset.isPicked = isPicked;
 
         if (isPicked) {