Skip to content

Fix tab switching #2660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 27, 2021
Merged

Fix tab switching #2660

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1801ead
Fix tab switching
haslinghuis Nov 20, 2021
a45cc1d
Merge branch 'master' into fix_tab_switch
haslinghuis Nov 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down Expand Up @@ -399,9 +401,9 @@ 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;

default:
console.log(`Tab not found: ${tab}`);
}
Expand Down