Skip to content
This repository was archived by the owner on Jul 13, 2020. It is now read-only.

Commit 8c6a1db

Browse files
committed
Fix error reporting bug
1 parent 88b1b09 commit 8c6a1db

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/loader.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ function logloads(loads) {
260260
// store the deps as load.deps
261261
load.declare = declare;
262262
load.depsList = deps;
263-
}
263+
}
264264
__eval(transpiled, __global, load);
265265
curSystem.register = curRegister;
266266
});
@@ -512,10 +512,11 @@ function logloads(loads) {
512512
function linkSetFailed(linkSet, load, exc) {
513513
var loader = linkSet.loader;
514514

515-
if (linkSet.loads[0].name != load.name)
515+
if (load && linkSet.loads[0].name != load.name)
516516
exc = addToError(exc, 'Error loading "' + load.name + '" from "' + linkSet.loads[0].name + '" at ' + (linkSet.loads[0].address || '<unknown>') + '\n');
517517

518-
exc = addToError(exc, 'Error loading "' + load.name + '" at ' + (load.address || '<unknown>') + '\n');
518+
if (load)
519+
exc = addToError(exc, 'Error loading "' + load.name + '" at ' + (load.address || '<unknown>') + '\n');
519520

520521
var loads = linkSet.loads.concat([]);
521522
for (var i = 0, l = loads.length; i < l; i++) {

0 commit comments

Comments
 (0)