c_meyer/pxt-calliope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't overwrite electron deploy (#2142)

Browse Source
This commit is contained in:
Richard Knoll 2019-06-07 08:59:41 -07:00 committed by Abhijith Chatra
parent 00e50997f8
commit 555d673014
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/extension.tsx
View File

@ -848,7 +848,7 @@ pxt.editor.initExtensionsAsync = function (opts: pxt.editor.ExtensionOptions): P
const isUwp = !!(window as any).Windows; const isUwp = !!(window as any).Windows;
if (isUwp) if (isUwp)
pxt.commands.deployCoreAsync = uwpDeployCoreAsync; pxt.commands.deployCoreAsync = uwpDeployCoreAsync;
else if (canHID() || pxt.webBluetooth.hasPartialFlash()) else if ((canHID() || pxt.webBluetooth.hasPartialFlash()) && !pxt.BrowserUtils.isPxtElectron())
pxt.commands.deployCoreAsync = deployCoreAsync; pxt.commands.deployCoreAsync = deployCoreAsync;
res.blocklyPatch = patchBlocks; res.blocklyPatch = patchBlocks;