From 22674c338bb971abfd38aad7c73638247ea22e47 Mon Sep 17 00:00:00 2001 From: Darren Lines Date: Sat, 18 Dec 2021 18:59:56 +0000 Subject: [PATCH] Update defaults_dialog.js Fixes the bug where clicking "Keep current settings" will stop configurators working until reboot. --- js/defaults_dialog.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/js/defaults_dialog.js b/js/defaults_dialog.js index 14288aed..d24f9b3b 100644 --- a/js/defaults_dialog.js +++ b/js/defaults_dialog.js @@ -13,6 +13,7 @@ helper.defaultsDialog = (function () { let data = [{ "title": 'Mini Quad with 3"-7" propellers', + "id": 2, "notRecommended": false, "reboot": true, "settings": [ @@ -578,6 +579,7 @@ helper.defaultsDialog = (function () { }, { "title": 'Rovers & Boats', + "id": 1, "notRecommended": false, "reboot": true, "settings": [ @@ -641,6 +643,7 @@ helper.defaultsDialog = (function () { }, { "title": 'Keep current settings (Not recommended)', + "id": 0, "notRecommended": true, "reboot": false, "settings": [ @@ -721,6 +724,11 @@ helper.defaultsDialog = (function () { let selectedDefaultPreset = data[$(event.currentTarget).data("index")]; if (selectedDefaultPreset && selectedDefaultPreset.settings) { + if (selectedDefaultPreset.id == 0) { + // Close applying preset dialog if keeping current settings. + savingDefaultsModal.close(); + } + mspHelper.loadBfConfig(function () { privateScope.setFeaturesBits(selectedDefaultPreset) });