Fix concurrent access to menuItemsToClickAfterStartup

facchinm · facchinm · commit a5ea2652ab0f · 2019-03-07T10:21:59.000+01:00
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -1357,7 +1357,7 @@ public void rebuildRecentBoardsMenu() throws Exception {
               buttonGroupsMap,
               board, board.getContainerPlatform(), board.getContainerPlatform().getContainerPackage());
       boardMenu.insert(item, 3);
-      item.setAccelerator(KeyStroke.getKeyStroke('0' + index,
+      item.setAccelerator(KeyStroke.getKeyStroke('1' + index,
          Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() |
          ActionEvent.SHIFT_MASK));
       recentBoardsButtonGroup.add(item);
@@ -1503,18 +1503,14 @@ public void actionPerformed(ActionEvent actionevent) {
       boardsCustomMenus.add(customMenu);
     }
 
-    menuItemsToClickAfterStartup = new LinkedList<>();
+    List<JMenuItem> _menuItemsToClickAfterStartup = new LinkedList<>();
     boardsButtonGroup = new ButtonGroup();
     recentBoardsButtonGroup = new ButtonGroup();
     buttonGroupsMap = new HashMap<>();
 
-    if (BaseNoGui.getRecentlyUsedBoards() != null) {
-      JMenuItem recentLabel = new JMenuItem(tr("Recently used boards"));
-      recentLabel.setEnabled(false);
-      boardMenu.add(recentLabel);
-      rebuildRecentBoardsMenu();
-      //rebuildRecentBoardsMenu(null);
-    }
+    JMenuItem recentLabel = new JMenuItem(tr("Recently used boards"));
+    recentLabel.setEnabled(false);
+    boardMenu.add(recentLabel);
 
     // Cycle through all packages
     for (TargetPackage targetPackage : BaseNoGui.packages.values()) {
@@ -1536,7 +1532,7 @@ public void actionPerformed(ActionEvent actionevent) {
         for (TargetBoard board : targetPlatform.getBoards().values()) {
           if (board.getPreferences().get("hide") != null)
             continue;
-          JMenuItem item = createBoardMenusAndCustomMenus(boardsCustomMenus, menuItemsToClickAfterStartup,
+          JMenuItem item = createBoardMenusAndCustomMenus(boardsCustomMenus, _menuItemsToClickAfterStartup,
                   buttonGroupsMap,
                   board, targetPlatform, targetPackage);
           boardMenu.add(item);
@@ -1545,14 +1541,16 @@ public void actionPerformed(ActionEvent actionevent) {
       }
     }
 
-    if (menuItemsToClickAfterStartup.isEmpty()) {
-      menuItemsToClickAfterStartup.add(selectFirstEnabledMenuItem(boardMenu));
+    if (_menuItemsToClickAfterStartup.isEmpty()) {
+      _menuItemsToClickAfterStartup.add(selectFirstEnabledMenuItem(boardMenu));
     }
 
-    for (JMenuItem menuItemToClick : menuItemsToClickAfterStartup) {
+    for (JMenuItem menuItemToClick : _menuItemsToClickAfterStartup) {
       menuItemToClick.setSelected(true);
       menuItemToClick.getAction().actionPerformed(new ActionEvent(this, -1, ""));
     }
+
+    menuItemsToClickAfterStartup = _menuItemsToClickAfterStartup;
   }
 
   private JRadioButtonMenuItem createBoardMenusAndCustomMenus(
