Commit e7d85d8

committed

Reopen serial monitor on correct port if changed from menu

1 parent 465c766 commit e7d85d8Copy full SHA for e7d85d8

File tree

+10

-12

lines changed

+10

-12

lines changed

Lines changed: 10 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -1015,22 +1015,20 @@ private void selectSerialPort(String name) {`
`1015`	`1015`	`//System.out.println(item.getLabel());`
`1016`	`1016`
`1017`	`1017`	`BaseNoGui.selectSerialPort(name);`
`1018`		`- if (serialMonitor != null) {`
`1019`		`- try {`
	`1018`	`+ try {`
	`1019`	`+ boolean reopenMonitor = ((serialMonitor != null && serialMonitor.isVisible()) \|\|`
	`1020`	`+ serialPlotter != null && serialPlotter.isVisible());`
	`1021`	`+ if (serialMonitor != null) {`
`1020`	`1022`	`serialMonitor.close();`
`1021`		`- serialMonitor.setVisible(false);`
`1022`		`- } catch (Exception e) {`
`1023`		`- // ignore`
`1024`	`1023`	`}`
`1025`		`- }`
`1026`		`-`
`1027`		`- if (serialPlotter != null) {`
`1028`		`- try {`
	`1024`	`+ if (serialPlotter != null) {`
`1029`	`1025`	`serialPlotter.close();`
`1030`		`- serialPlotter.setVisible(false);`
`1031`		`- } catch (Exception e) {`
`1032`		`- // ignore`
`1033`	`1026`	`}`
	`1027`	`+ if (reopenMonitor) {`
	`1028`	`+ handleSerial();`
	`1029`	`+ }`
	`1030`	`+ } catch (Exception e) {`
	`1031`	`+ // ignore`
`1034`	`1032`	`}`
`1035`	`1033`
`1036`	`1034`	`onBoardOrPortChange();`

Comments

(0)