Merge pull request electron#9716 from dakira/fix-9046

Add tray icon workaround for newer Ubuntu releases (fixes electron#9046)
ainvoner · Jun 9, 2017 · a6ea316 · a6ea316
2 parents 206bca5 + 43271c1
commit a6ea316
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/browser/init.js b/lib/browser/init.js
@@ -162,8 +162,8 @@ 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') {
+// Workaround for electron/electron#5050 and electron/electron#9046
+if (process.platform === 'linux' && ['Pantheon', 'Unity:Unity7'].includes(process.env.XDG_CURRENT_DESKTOP)) {
   process.env.XDG_CURRENT_DESKTOP = 'Unity'
 }