[RecentlyUsedBoards] Fix merge conflicts

facchinm · facchinm · commit abbd40242d8f · 2020-04-07T14:09:06.000+02:00
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) {

Original file line number	Diff line number	Diff line change
`@@ -1585,6 +1585,7 @@ public void actionPerformed(ActionEvent actionevent) {`
`1585`	`1585`	`JMenuItem recentLabel = new JMenuItem(tr("Recently used boards"));`
`1586`	`1586`	`recentLabel.setEnabled(false);`
`1587`	`1587`	`boardMenu.add(recentLabel);`
	`1588`	`+ boardMenu.add(new JSeparator());`
`1588`	`1589`	`}`
`1589`	`1590`
`1590`	`1591`	`List<JMenu> platformMenus = new ArrayList<>();`
`@@ -1643,7 +1644,7 @@ public void actionPerformed(ActionEvent actionevent) {`
`1643`	`1644`	`// If there is no current board yet (first startup, or selected`
`1644`	`1645`	`// board no longer defined), select first available board.`
`1645`	`1646`	`if (_menuItemsToClickAfterStartup.isEmpty()) {`
`1646`		`- _menuItemsToClickAfterStartup.add(selectFirstEnabledMenuItem(boardMenu))`
	`1647`	`+ _menuItemsToClickAfterStartup.add(firstBoardItem);`
`1647`	`1648`	`}`
`1648`	`1649`
`1649`	`1650`	`for (JMenuItem menuItemToClick : _menuItemsToClickAfterStartup) {`