@@ -1468,19 +1468,31 @@ public void actionPerformed(ActionEvent actionevent) {
14681468 ButtonGroup boardsButtonGroup = new ButtonGroup ();
14691469 Map <String , ButtonGroup > buttonGroupsMap = new HashMap <>();
14701470
1471+ int platformCount = 0 ;
1472+ for (TargetPackage targetPackage : BaseNoGui .packages .values ()) {
1473+ for (TargetPlatform targetPlatform : targetPackage .platforms ()) {
1474+ ++platformCount ;
1475+ }
1476+ }
1477+
14711478 // Cycle through all packages
14721479 for (TargetPackage targetPackage : BaseNoGui .packages .values ()) {
14731480 // For every package cycle through all platform
14741481 for (TargetPlatform targetPlatform : targetPackage .platforms ()) {
1475-
1476- // Add a title for each platform
1477- String platformLabel = targetPlatform .getPreferences ().get ("name" );
1478- if (platformLabel == null )
1479- platformLabel = targetPackage .getId () + "-" + targetPlatform .getId ();
1480-
1481- JMenu platformBoardsMenu = new JMenu (tr (platformLabel ));
1482- MenuScroller .setScrollerFor (platformBoardsMenu );
1483- boardMenu .add (platformBoardsMenu );
1482+ JMenu platformBoardsMenu ;
1483+ if (platformCount == 1 ) {
1484+ // With just single platform, just add all platforms directly
1485+ platformBoardsMenu = boardMenu ;
1486+ } else {
1487+ // Add a submenu for each platform
1488+ String platformLabel = targetPlatform .getPreferences ().get ("name" );
1489+ if (platformLabel == null )
1490+ platformLabel = targetPackage .getId () + "-" + targetPlatform .getId ();
1491+
1492+ platformBoardsMenu = new JMenu (tr (platformLabel ));
1493+ MenuScroller .setScrollerFor (platformBoardsMenu );
1494+ boardMenu .add (platformBoardsMenu );
1495+ }
14841496
14851497 // Cycle through all boards of this platform
14861498 for (TargetBoard board : targetPlatform .getBoards ().values ()) {
0 commit comments