[RecentlyUsedBoards] Fix merge conflicts

arduino · Apr 7, 2020 · abbd402 · abbd402
1 parent 917b132
commit abbd402
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -1585,6 +1585,7 @@ public void actionPerformed(ActionEvent actionevent) {
       JMenuItem recentLabel = new JMenuItem(tr("Recently used boards"));
       recentLabel.setEnabled(false);
       boardMenu.add(recentLabel);
+      boardMenu.add(new JSeparator());
     }
 
     List<JMenu> platformMenus = new ArrayList<>();
@@ -1643,7 +1644,7 @@ public void actionPerformed(ActionEvent actionevent) {
     // If there is no current board yet (first startup, or selected
     // board no longer defined), select first available board.
     if (_menuItemsToClickAfterStartup.isEmpty()) {
-      _menuItemsToClickAfterStartup.add(selectFirstEnabledMenuItem(boardMenu))
+      _menuItemsToClickAfterStartup.add(firstBoardItem);
     }
 
     for (JMenuItem menuItemToClick : _menuItemsToClickAfterStartup) {