Merge branch 'fix-extensions-toggle' into staging

751ff45cc12b8e31b25d8ceea76f7adefd27a658

Cohee <18619528+Cohee1207@users.noreply.github.com>

public/scripts/extensions.js+8 -1 Viewed

             await oldPopup.complete(POPUP_RESULT.CANCELLED);
+        }
 +        let waitingForSave = false;
++
         const popup = new Popup(html, POPUP_TYPE.TEXT, '', {
             okButton: 'Close',
             wide: true,

             customButtons: [updateAllButton],
             allowVerticalScrolling: true,
             onClosing: async () => {
 +                if (waitingForSave) {
 +                    return false;
 +                }
                 if (stateChanged) {
 -                    toastr.info('The page will be reloaded shortly...', 'Extensions state changed');
 +                    waitingForSave = true;
 +                    const toast = toastr.info('The page will be reloaded shortly...', 'Extensions state changed');
                     await saveSettings();
 +                    toastr.clear(toast);
+                }
                 return true;
             },