Merge pull request #7319 from Menci/master

Workaround for electron/electron#5050
This commit is contained in:
Cheng Zhao 2016-09-29 16:42:30 +08:00 committed by GitHub
commit 734f42b5f9

View file

@ -162,5 +162,10 @@ require('./api/protocol')
// Set main startup script of the app.
const mainStartupScript = packageJson.main || 'index.js'
// Workaround for electron/electron#5050
if (process.platform === 'linux' && process.env.XDG_CURRENT_DESKTOP === 'Pantheon') {
process.env.XDG_CURRENT_DESKTOP = 'Unity'
}
// Finally load app's main.js and transfer control to C++.
Module._load(path.join(packagePath, mainStartupScript), Module, true)