Skip to content

Commit

Permalink
Merge pull request #331 from levithomason/patch-1
Browse files Browse the repository at this point in the history
fix(browser): do not override ls debug if found
  • Loading branch information
thebigredgeek authored Nov 14, 2016
2 parents a746d52 + 20c37fd commit 2caf4ef
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,13 @@ function save(namespaces) {
function load() {
var r;
try {
r = exports.storage.debug;
return exports.storage.debug;
} catch(e) {}

// If debug isn't set in LS, and we're in Electron, try to load $DEBUG
if (typeof process !== 'undefined' && 'env' in process) {
r = process.env.DEBUG;
return process.env.DEBUG;
}

return r;
}

/**
Expand Down

0 comments on commit 2caf4ef

Please sign in to comment.