Skip to content

Commit 7dad180

Browse files
committed
fix flasher crashed when enumSerialPort failed
1 parent 8011329 commit 7dad180

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

src/HexUploader.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,12 +257,21 @@ export abstract class HexUploader<InvokeParamsType> {
257257

258258
resolveHexFilePathEnvs(input: string, programs: FlashProgramFile[]): string {
259259

260-
const portList = ResManager.GetInstance().enumSerialPort();
260+
let portList: string[] = [];
261+
try {
262+
portList = ResManager.GetInstance().enumSerialPort();
263+
} catch (error) {
264+
GlobalEvent.log_error(error);
265+
}
261266

262267
let commandLine = input
263268
.replace(/\$\{hexFile\}|\$\{binFile\}|\$\{programFile\}/ig, programs[0].path)
264269
.replace(/\$\{port\}/ig, portList[0] || '')
265-
.replace(/\$\{portList\}/ig, portList.join(' '));
270+
.replace(/\$\{portList\}/ig, portList.join(' '))
271+
.replace('${port[0]}', portList[0] || '')
272+
.replace('${port[1]}', portList[1] || '')
273+
.replace('${port[2]}', portList[2] || '')
274+
.replace('${port[3]}', portList[3] || '');
266275

267276
programs.forEach((file, index) => {
268277

0 commit comments

Comments
 (0)