Skip to content
This repository was archived by the owner on Oct 1, 2024. It is now read-only.

Fix errors that frequently happened #581

Merged
merged 2 commits into from
Jun 8, 2018
Merged

Fix errors that frequently happened #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb1ac7a
v0.2.16 (#580)
czgtest Jun 6, 2018
dc13afd
Merge branch 'master' into chenbranch
Sneezry Jun 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/arduino/arduinoContentProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ export class ArduinoContentProvider implements vscode.TextDocumentContentProvide

public async getBoardConfig(req, res) {
return res.json({
configitems: ArduinoContext.boardManager.currentBoard.configItems,
configitems: (ArduinoContext.boardManager.currentBoard === null) ? null : ArduinoContext.boardManager.currentBoard.configItems,
});
}

Expand Down
6 changes: 3 additions & 3 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export async function activate(context: vscode.ExtensionContext) {
registerArduinoCommand("arduino.reloadExample", () => {
arduinoManagerProvider.update(EXAMPLES_URI);
}, () => {
return { board: ArduinoContext.boardManager.currentBoard.name };
return { board: (ArduinoContext.boardManager.currentBoard === null) ? null : ArduinoContext.boardManager.currentBoard.name };
});

registerArduinoCommand("arduino.initialize", async () => await deviceContext.initialize());
Expand All @@ -151,7 +151,7 @@ export async function activate(context: vscode.ExtensionContext) {
delete status.compile;
}
}, () => {
return { board: ArduinoContext.boardManager.currentBoard.name };
return { board: (ArduinoContext.boardManager.currentBoard === null) ? null : ArduinoContext.boardManager.currentBoard.name };
});

registerArduinoCommand("arduino.upload", async () => {
Expand Down Expand Up @@ -216,7 +216,7 @@ export async function activate(context: vscode.ExtensionContext) {
delete status.compile;
}
}, () => {
return { board: ArduinoContext.boardManager.currentBoard.name };
return { board: (ArduinoContext.boardManager.currentBoard === null) ? null : ArduinoContext.boardManager.currentBoard.name };
});

registerArduinoCommand("arduino.addLibPath", (path) => ArduinoContext.arduinoApp.addLibPath(path));
Expand Down