Commit 74dd907

authored

[skip-changelog] Handle errors that occur during reset (#2183)

1 parent ba534c0 commit 74dd907Copy full SHA for 74dd907

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,8 @@ func Reset(portToTouch string, wait bool, cb *ResetProgressCallbacks, dryRun boo`
`131`	`131`	`if dryRun {`
`132`	`132`	`// do nothing!`
`133`	`133`	`} else {`
`134`		`- if err := TouchSerialPortAt1200bps(portToTouch); err != nil {`
`135`		`- fmt.Println(tr("TOUCH: error during reset: %s", err))`
	`134`	`+ if err := TouchSerialPortAt1200bps(portToTouch); err != nil &&!wait{`
	`135`	`+ return"", errors.Errorf(tr("TOUCH: error during reset: %s", err))`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ func runProgramAction(pme *packagemanager.Explorer,`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`if newPortAddress, err := serialutils.Reset(portToTouch, wait, cb, dryRun); err != nil {`
`433`		`- outStream.Write([]byte(fmt.Sprintln(tr("Cannot perform port reset: %s", err))))`
	`433`	`+ errStream.Write([]byte(fmt.Sprintln(tr("Cannot perform port reset: %s", err))))`
`434`	`434`	`} else {`
`435`	`435`	`if newPortAddress != "" {`
`436`	`436`	`actualPort.Address = newPortAddress`

Comments

(0)